diff --git a/.coveragerc b/.coveragerc index 78c1c89b1406..197d0c6039f7 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,13 +1,13 @@ [run] branch = True -[report] -fail_under = 100 -show_missing = True - [report] omit = */_generated/*.py + # Packages in the "google.cloud" package that we don't own. + */google/cloud/logging/v2/* + */google/cloud/pubsub/v1/* +fail_under = 100 show_missing = True exclude_lines = # Re-enable the standard pragma diff --git a/.travis.yml b/.travis.yml index f5ad2f3126f5..8add43491b7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ script: - tox -e system-tests - tox -e system-tests3 - tox -e docs - - tox -e json-docs after_success: - tox -e coveralls @@ -25,7 +24,7 @@ deploy: secure: keSFPLzVj/yAAJ8kw4m+U5kpIiGqubpDqhcHPlGAvMohFMIO4D8ffgCqJdbhQshTtb/wiS5ajK1KNpEzq4BKD/5oRXuj/sIRTMENzX/azUXkT/bADLEGocyfE4/NAGQ9mcDOmHntjt7UUhYN6H87rgex22er4V1vD5tGf5Kc1HU= on: tags: true - repo: GoogleCloudPlatform/gcloud-python + repo: GoogleCloudPlatform/google-cloud-python # until this is fixed: https://github.com/travis-ci/travis-ci/issues/1675 all_branches: true # 'bdist_wheel' builds disabled until #1879 et al. are resolved. diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst index 153301006bdc..37686c3ad620 100644 --- a/CONTRIBUTING.rst +++ b/CONTRIBUTING.rst @@ -6,32 +6,32 @@ Contributing #. Make sure that your commit messages clearly describe the changes. #. Send a pull request. -Here are some guidelines for hacking on ``gcloud-python``. +Here are some guidelines for hacking on ``google-cloud-python``. Using a Development Checkout ---------------------------- -You'll have to create a development environment to hack on ``gcloud-python``, +You'll have to create a development environment to hack on ``google-cloud-python``, using a Git checkout: -- While logged into your GitHub account, navigate to the ``gcloud-python`` repo +- While logged into your GitHub account, navigate to the ``google-cloud-python`` repo on GitHub. - https://github.com/GoogleCloudPlatform/gcloud-python + https://github.com/GoogleCloudPlatform/google-cloud-python -- Fork and clone the ``gcloud-python`` repository to your GitHub account by +- Fork and clone the ``google-cloud-python`` repository to your GitHub account by clicking the "Fork" button. -- Clone your fork of ``gcloud-python`` from your GitHub account to your local +- Clone your fork of ``google-cloud-python`` from your GitHub account to your local computer, substituting your account username and specifying the destination - as "hack-on-gcloud". E.g.:: + as "hack-on-google-cloud-python". E.g.:: $ cd ~ - $ git clone git@github.com:USERNAME/gcloud-python.git hack-on-gcloud - $ cd hack-on-gcloud - # Configure remotes such that you can pull changes from the gcloud-python + $ git clone git@github.com:USERNAME/google-cloud-python.git hack-on-google-cloud-python + $ cd hack-on-google-cloud-python + # Configure remotes such that you can pull changes from the google-cloud-python # repository into your local repository. - $ git remote add upstream https://github.com:GoogleCloudPlatform/gcloud-python + $ git remote add upstream https://github.com:GoogleCloudPlatform/google-cloud-python # fetch and merge changes from upstream into master $ git fetch upstream $ git merge upstream/master @@ -39,9 +39,9 @@ using a Git checkout: 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. -- Create a virtualenv in which to install ``gcloud-python``:: +- Create a virtualenv in which to install ``google-cloud-python``:: - $ cd ~/hack-on-gcloud + $ cd ~/hack-on-google-cloud-python $ virtualenv --python python2.7 env Note that very old versions of virtualenv (virtualenv versions below, say, @@ -52,16 +52,16 @@ repo, from which you can submit a pull request. flag to ``virtualenv``. For example, ``virtualenv --python python2.7`` chooses the Python 2.7 interpreter to be installed. - From here on in within these instructions, the ``~/hack-on-gcloud/env`` + From here on in within these instructions, the ``~/hack-on-google-cloud-python/env`` virtual environment you created above will be referred to as ``$VENV``. To use the instructions in the steps that follow literally, use the - ``export VENV=~/hack-on-gcloud/env`` command. + ``export VENV=~/hack-on-google-cloud-python/env`` command. -- Install ``gcloud-python`` from the checkout into the virtualenv using +- Install ``google-cloud-python`` from the checkout into the virtualenv using ``setup.py develop``. Running ``setup.py develop`` *must* be done while - the current working directory is the ``gcloud-python`` checkout directory:: + the current working directory is the ``google-cloud-python`` checkout directory:: - $ cd ~/hack-on-gcloud + $ cd ~/hack-on-google-cloud-python $ $VENV/bin/python setup.py develop I'm getting weird errors... Can you help? @@ -76,7 +76,7 @@ On Debian/Ubuntu:: Adding Features --------------- -In order to add a feature to ``gcloud-python``: +In order to add a feature to ``google-cloud-python``: - The feature must be documented in both the API and narrative documentation (in ``docs/``). @@ -100,11 +100,11 @@ Coding Style - In order to make ``tox -e lint`` run faster, you can set some environment variables:: - export GCLOUD_REMOTE_FOR_LINT="upstream" - export GCLOUD_BRANCH_FOR_LINT="master" + export GOOGLE_CLOUD_REMOTE_FOR_LINT="upstream" + export GOOGLE_CLOUD_BRANCH_FOR_LINT="master" By doing this, you are specifying the location of the most up-to-date - version of ``gcloud-python``. The the suggested remote name ``upstream`` + version of ``google-cloud-python``. The the suggested remote name ``upstream`` should point to the official ``GoogleCloudPlatform`` checkout and the the branch should be the main branch on that remote (``master``). @@ -117,21 +117,21 @@ Exceptions to PEP8: Running Tests -------------- -- To run all tests for ``gcloud-python`` on a single Python version, run +- 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). -- To run the full set of ``gcloud-python`` tests on all platforms, install +- To run the full set of ``google-cloud-python`` tests on all platforms, install ``tox`` (https://testrun.org/tox/) into a system Python. The ``tox`` console script will be installed into the scripts location for that Python. While - ``cd``'ed to the ``gcloud-python`` checkout root directory (it contains + ``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 /usr/bin/pip install tox - $ cd ~/hack-on-gcloud/ + $ cd ~/hack-on-google-cloud-python/ $ /usr/bin/tox Running System Tests @@ -153,7 +153,7 @@ Running System Tests so you'll need to provide some environment variables to facilitate authentication to your project: - - ``GCLOUD_TESTS_PROJECT_ID``: Developers Console project ID (e.g. + - ``GOOGLE_CLOUD_TESTS_PROJECT_ID``: Developers Console project ID (e.g. bamboo-shift-455). - ``GOOGLE_APPLICATION_CREDENTIALS``: The path to a JSON key file; see ``system_tests/app_credentials.json.sample`` as an example. Such a file @@ -187,7 +187,7 @@ Running System Tests # Create the indexes $ gcloud preview datastore create-indexes system_tests/data/index.yaml \ - > --project=$GCLOUD_TESTS_PROJECT_ID + > --project=$GOOGLE_CLOUD_TESTS_PROJECT_ID # Restore your environment to its previous state. $ unset CLOUDSDK_PYTHON_SITEPACKAGES @@ -223,14 +223,14 @@ Running System Tests $ gcloud beta emulators datastore env-init export DATASTORE_LOCAL_HOST=localhost:8417 export DATASTORE_HOST=http://localhost:8417 - export DATASTORE_DATASET=gcloud-settings-app-id - export DATASTORE_PROJECT_ID=gcloud-settings-app-id + 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=gcloud-settings-app-id \ - > GCLOUD_NO_PRINT=true \ + > DATASTORE_DATASET=google-cloud-settings-app-id \ + > GOOGLE_CLOUD_NO_PRINT=true \ > python system_tests/run_system_test.py \ > --package=datastore --ignore-requirements @@ -283,22 +283,22 @@ changed to reflect the bug fix, ideally in the same commit that fixes the bug or adds the feature. To build and review docs (where ``$VENV`` refers to the virtualenv you're -using to develop ``gcloud-python``): +using to develop ``google-cloud-python``): 1. After following the steps above in "Using a Development Checkout", install Sphinx and all development requirements in your virtualenv:: - $ cd ~/hack-on-gcloud + $ cd ~/hack-on-google-cloud-python $ $VENV/bin/pip install Sphinx -2. Change into the ``docs`` directory within your ``gcloud-python`` checkout and +2. Change into the ``docs`` directory within your ``google-cloud-python`` checkout and execute the ``make`` command with some flags:: - $ cd ~/hack-on-gcloud/gcloud-python/docs + $ cd ~/hack-on-google-cloud-python/google-cloud-python/docs $ make clean html SPHINXBUILD=$VENV/bin/sphinx-build The ``SPHINXBUILD=...`` argument tells Sphinx to use the virtualenv Python, - which will have both Sphinx and ``gcloud-python`` (for API documentation + which will have both Sphinx and ``google-cloud-python`` (for API documentation generation) installed. 3. Open the ``docs/_build/html/index.html`` file to see the resulting HTML @@ -314,7 +314,7 @@ build via:: $ tox -e docs-rtd -.. _readthedocs: http://gcloud-python.readthedocs.org/ +.. _readthedocs: http://google-cloud-python.readthedocs.org/ Note About ``README`` as it pertains to PyPI -------------------------------------------- @@ -323,10 +323,10 @@ The `description on PyPI`_ for the project comes directly from the ``README``. Due to the reStructuredText (``rst``) parser used by PyPI, relative links which will work on GitHub (e.g. ``CONTRIBUTING.rst`` instead of -``https://github.com/GoogleCloudPlatform/gcloud-python/blob/master/CONTRIBUTING.rst``) +``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/gcloud +.. _description on PyPI: https://pypi.python.org/pypi/google-cloud Travis Configuration and Build Optimizations -------------------------------------------- @@ -364,7 +364,7 @@ We support: Supported versions can be found in our ``tox.ini`` `config`_. -.. _config: https://github.com/GoogleCloudPlatform/gcloud-python/blob/master/tox.ini +.. _config: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/tox.ini We explicitly decided not to support `Python 2.5`_ due to `decreased usage`_ and lack of continuous integration `support`_. @@ -387,7 +387,7 @@ We also explicitly decided to support Python 3 beginning with version .. _prominent: https://docs.djangoproject.com/en/1.9/faq/install/#what-python-version-can-i-use-with-django .. _projects: http://flask.pocoo.org/docs/0.10/python3/ .. _Unicode literal support: https://www.python.org/dev/peps/pep-0414/ -.. _dropped 2.6: https://github.com/GoogleCloudPlatform/gcloud-python/issues/995 +.. _dropped 2.6: https://github.com/GoogleCloudPlatform/google-cloud-python/issues/995 Versioning ---------- diff --git a/MANIFEST.in b/MANIFEST.in index 5d1af3e9f0b0..ae20b86a84fd 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,3 +1,3 @@ include README.rst -graft gcloud +graft google global-exclude *.pyc diff --git a/Makefile.bigtable_v2 b/Makefile.bigtable_v2 index fa921203fb2d..46a958cf4234 100644 --- a/Makefile.bigtable_v2 +++ b/Makefile.bigtable_v2 @@ -1,12 +1,12 @@ GRPCIO_VIRTUALENV=$(shell pwd)/grpc_python_venv GENERATED_DIR=$(shell pwd)/generated_python GENERATED_SUBDIR=_generated -BIGTABLE_DIR=$(shell pwd)/gcloud/bigtable/$(GENERATED_SUBDIR) +BIGTABLE_DIR=$(shell pwd)/google/cloud/bigtable/$(GENERATED_SUBDIR) PROTOC_CMD=$(GRPCIO_VIRTUALENV)/bin/python -m grpc.tools.protoc GOOGLEAPIS_PROTOS_DIR=$(shell pwd)/googleapis-pb help: - @echo 'Makefile for gcloud-python Bigtable protos ' + @echo 'Makefile for google-cloud-python Bigtable protos ' @echo ' ' @echo ' make generate Generates the protobuf modules ' @echo ' make clean Clean generated files ' diff --git a/Makefile.datastore b/Makefile.datastore index d9af38948ccf..837f5ba26390 100644 --- a/Makefile.datastore +++ b/Makefile.datastore @@ -1,11 +1,11 @@ GRPCIO_VIRTUALENV=$(shell pwd)/grpc_python_venv GENERATED_DIR=$(shell pwd)/generated_python -DATASTORE_DIR=$(shell pwd)/gcloud/datastore/_generated +DATASTORE_DIR=$(shell pwd)/google/cloud/datastore/_generated PROTOC_CMD=$(GRPCIO_VIRTUALENV)/bin/python -m grpc.tools.protoc GOOGLEAPIS_PROTOS_DIR=$(shell pwd)/googleapis-pb help: - @echo 'Makefile for gcloud-python Bigtable protos ' + @echo 'Makefile for google-cloud-python Bigtable protos ' @echo ' ' @echo ' make generate Generates the protobuf modules ' @echo ' make clean Clean generated files ' diff --git a/README.rst b/README.rst index 68bad65d7ea4..cf8c4941c561 100644 --- a/README.rst +++ b/README.rst @@ -10,8 +10,8 @@ Google Cloud Python Client - `Homepage`_ - `API Documentation`_ -.. _Homepage: https://googlecloudplatform.github.io/gcloud-python/ -.. _API Documentation: http://googlecloudplatform.github.io/gcloud-python/#/docs/master/gcloud +.. _Homepage: https://googlecloudplatform.github.io/google-cloud-python/ +.. _API Documentation: http://googlecloudplatform.github.io/google-cloud-python/#/docs/master/google-cloud This client supports the following Google Cloud Platform services: @@ -23,13 +23,13 @@ This client supports the following Google Cloud Platform services: - `Google Stackdriver Logging`_ - `Google Stackdriver Monitoring`_ -.. _Google Cloud Datastore: https://github.com/GoogleCloudPlatform/gcloud-python#google-cloud-datastore -.. _Google Cloud Storage: https://github.com/GoogleCloudPlatform/gcloud-python#google-cloud-storage -.. _Google Cloud Pub/Sub: https://github.com/GoogleCloudPlatform/gcloud-python#google-cloud-pubsub -.. _Google BigQuery: https://github.com/GoogleCloudPlatform/gcloud-python#google-bigquery -.. _Google Cloud Resource Manager: https://github.com/GoogleCloudPlatform/gcloud-python#google-cloud-resource-manager -.. _Google Stackdriver Logging: https://github.com/GoogleCloudPlatform/gcloud-python#google-stackdriver-logging -.. _Google Stackdriver Monitoring: https://github.com/GoogleCloudPlatform/gcloud-python#google-stackdriver-monitoring +.. _Google Cloud Datastore: https://github.com/GoogleCloudPlatform/google-cloud-python#google-cloud-datastore +.. _Google Cloud Storage: https://github.com/GoogleCloudPlatform/google-cloud-python#google-cloud-storage +.. _Google Cloud Pub/Sub: https://github.com/GoogleCloudPlatform/google-cloud-python#google-cloud-pubsub +.. _Google BigQuery: https://github.com/GoogleCloudPlatform/google-cloud-python#google-bigquery +.. _Google Cloud Resource Manager: https://github.com/GoogleCloudPlatform/google-cloud-python#google-cloud-resource-manager +.. _Google Stackdriver Logging: https://github.com/GoogleCloudPlatform/google-cloud-python#google-stackdriver-logging +.. _Google Stackdriver Monitoring: https://github.com/GoogleCloudPlatform/google-cloud-python#google-stackdriver-monitoring If you need support for other Google APIs, check out the `Google APIs Python Client library`_. @@ -41,27 +41,27 @@ Quick Start :: - $ pip install --upgrade gcloud + $ pip install --upgrade google-cloud Example Applications -------------------- - `getting-started-python`_ - A sample and `tutorial`_ that demonstrates how to build a complete web application using Cloud Datastore, Cloud Storage, and Cloud Pub/Sub and deploy it to Google App Engine or Google Compute Engine. -- `gcloud-python-expenses-demo`_ - A sample expenses demo using Cloud Datastore and Cloud Storage +- `google-cloud-python-expenses-demo`_ - A sample expenses demo using Cloud Datastore and Cloud Storage .. _getting-started-python: https://github.com/GoogleCloudPlatform/getting-started-python .. _tutorial: https://cloud.google.com/python -.. _gcloud-python-expenses-demo: https://github.com/GoogleCloudPlatform/gcloud-python-expenses-demo +.. _google-cloud-python-expenses-demo: https://github.com/GoogleCloudPlatform/google-cloud-python-expenses-demo Authentication -------------- -With ``gcloud-python`` we try to make authentication as painless as possible. +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 ``gcloud-*`` -libraries to be helpful. +You may also find the `authentication document`_ shared by all the +``google-cloud-*`` libraries to be helpful. -.. _Authentication section: http://gcloud-python.readthedocs.org/en/latest/gcloud-auth.html +.. _Authentication section: http://google-cloud-python.readthedocs.org/en/latest/gcloud-auth.html .. _authentication document: https://github.com/GoogleCloudPlatform/gcloud-common/tree/master/authentication Google Cloud Datastore @@ -76,10 +76,10 @@ consistency for all other queries. .. _Cloud Datastore: https://cloud.google.com/datastore/docs .. _Datastore API docs: https://cloud.google.com/datastore/docs/ -See the ``gcloud-python`` API `datastore documentation`_ to learn how to +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/gcloud-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. @@ -88,7 +88,7 @@ to activate Cloud Datastore for your project. .. code:: python - from gcloud import datastore + from google.cloud import datastore # Create, populate and persist an entity entity = datastore.Entity(key=datastore.Key('EntityKind')) entity.update({ @@ -111,10 +111,10 @@ be used to distribute large data objects to users via direct download. .. _Cloud Storage: https://cloud.google.com/storage/docs .. _Storage API docs: https://cloud.google.com/storage/docs/json_api/v1 -See the ``gcloud-python`` API `storage documentation`_ to learn how to connect +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/gcloud-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 @@ -124,7 +124,7 @@ how to create a bucket. .. code:: python - from gcloud import storage + from google.cloud import storage client = storage.Client() bucket = client.get_bucket('bucket-id-here') # Then do other things... @@ -147,16 +147,16 @@ independently written applications. .. _Cloud Pub/Sub: https://cloud.google.com/pubsub/docs .. _Pub/Sub API docs: https://cloud.google.com/pubsub/reference/rest/ -See the ``gcloud-python`` API `Pub/Sub documentation`_ to learn how to connect +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/gcloud-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 .. code:: python - from gcloud import pubsub + from google.cloud import pubsub client = pubsub.Client() topic = client.topic('topic_name') @@ -185,8 +185,8 @@ Load data from CSV import csv - from gcloud import bigquery - from gcloud.bigquery import SchemaField + from google.cloud import bigquery + from google.cloud.bigquery import SchemaField client = bigquery.Client() @@ -221,10 +221,10 @@ Perform a synchronous query print row -See the ``gcloud-python`` API `BigQuery documentation`_ to learn how to connect +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/gcloud-python/stable/bigquery-usage.html +.. _BigQuery documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/bigquery-usage.html Google Cloud Resource Manager ----------------------------- @@ -236,10 +236,10 @@ Google Cloud Platform. .. _Resource Manager: https://cloud.google.com/resource-manager/ .. _Resource Manager API docs: https://cloud.google.com/resource-manager/reference/rest/ -See the ``gcloud-python`` API `Resource Manager documentation`_ to learn how to +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/gcloud-python/stable/resource-manager-api.html +.. _Resource Manager documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/resource-manager-api.html Google Stackdriver Logging -------------------------- @@ -252,7 +252,7 @@ analyze, monitor, and alert on log data and events from Google Cloud Platform. .. code:: python - from gcloud import logging + from google.cloud import logging client = logging.Client() logger = client.logger('log_name') logger.log_text("A simple entry") # API call @@ -265,10 +265,10 @@ Example of fetching entries: for entry in entries: print entry.payload -See the ``gcloud-python`` API `logging documentation`_ to learn how to connect +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/gcloud-python/stable/logging-usage.html +.. _logging documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/logging-usage.html Google Stackdriver Monitoring ----------------------------- @@ -290,7 +290,7 @@ List available metric types: .. code:: python - from gcloud import monitoring + from google.cloud import monitoring client = monitoring.Client() for descriptor in client.list_metric_descriptors(): print(descriptor.type) @@ -303,10 +303,10 @@ Display CPU utilization across your GCE instances during the last five minutes: query = client.query(metric, minutes=5) print(query.as_dataframe()) -See the ``gcloud-python`` API `monitoring documentation`_ to learn how to connect +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/gcloud-python/stable/monitoring-usage.html +.. _monitoring documentation: https://googlecloudplatform.github.io/google-cloud-python/stable/monitoring-usage.html Contributing ------------ @@ -315,20 +315,20 @@ Contributions to this library are always welcome and highly encouraged. See `CONTRIBUTING`_ for more information on how to get started. -.. _CONTRIBUTING: https://github.com/GoogleCloudPlatform/gcloud-python/blob/master/CONTRIBUTING.rst +.. _CONTRIBUTING: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/CONTRIBUTING.rst License ------- Apache 2.0 - See `LICENSE`_ for more information. -.. _LICENSE: https://github.com/GoogleCloudPlatform/gcloud-python/blob/master/LICENSE +.. _LICENSE: https://github.com/GoogleCloudPlatform/google-cloud-python/blob/master/LICENSE -.. |build| image:: https://travis-ci.org/GoogleCloudPlatform/gcloud-python.svg?branch=master - :target: https://travis-ci.org/GoogleCloudPlatform/gcloud-python -.. |coverage| image:: https://coveralls.io/repos/GoogleCloudPlatform/gcloud-python/badge.png?branch=master - :target: https://coveralls.io/r/GoogleCloudPlatform/gcloud-python?branch=master -.. |pypi| image:: https://img.shields.io/pypi/v/gcloud.svg - :target: https://pypi.python.org/pypi/gcloud -.. |versions| image:: https://img.shields.io/pypi/pyversions/gcloud.svg - :target: https://pypi.python.org/pypi/gcloud +.. |build| image:: https://travis-ci.org/GoogleCloudPlatform/google-cloud-python.svg?branch=master + :target: https://travis-ci.org/GoogleCloudPlatform/google-cloud-python +.. |coverage| image:: https://coveralls.io/repos/GoogleCloudPlatform/google-cloud-python/badge.png?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 +.. |versions| image:: https://img.shields.io/pypi/pyversions/google-cloud.svg + :target: https://pypi.python.org/pypi/google-cloud diff --git a/docs/Makefile b/docs/Makefile index 1e6ed7cc95e3..d44af429f535 100644 --- a/docs/Makefile +++ b/docs/Makefile @@ -77,17 +77,17 @@ qthelp: @echo @echo "Build finished; now you can run "qcollectiongenerator" with the" \ ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/gclouddatastore.qhcp" + @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/google-cloud.qhcp" @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/gclouddatastore.qhc" + @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/google-cloud.qhc" devhelp: $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp @echo @echo "Build finished." @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/gclouddatastore" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/gclouddatastore" + @echo "# mkdir -p $$HOME/.local/share/devhelp/google-cloud" + @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/google-cloud" @echo "# devhelp" epub: diff --git a/docs/bigquery-client.rst b/docs/bigquery-client.rst index 2dbb17c02ed9..a1c41f689ce4 100644 --- a/docs/bigquery-client.rst +++ b/docs/bigquery-client.rst @@ -1,13 +1,13 @@ BigQuery Client =============== -.. automodule:: gcloud.bigquery.client +.. automodule:: google.cloud.bigquery.client :members: :show-inheritance: Connection ~~~~~~~~~~ -.. automodule:: gcloud.bigquery.connection +.. automodule:: google.cloud.bigquery.connection :members: :show-inheritance: diff --git a/docs/bigquery-dataset.rst b/docs/bigquery-dataset.rst index 7ea68c97c4e8..dd1d05352918 100644 --- a/docs/bigquery-dataset.rst +++ b/docs/bigquery-dataset.rst @@ -1,6 +1,6 @@ Datasets ~~~~~~~~ -.. automodule:: gcloud.bigquery.dataset +.. automodule:: google.cloud.bigquery.dataset :members: :show-inheritance: diff --git a/docs/bigquery-job.rst b/docs/bigquery-job.rst index 3af44e9da0a3..7745a1ceb13a 100644 --- a/docs/bigquery-job.rst +++ b/docs/bigquery-job.rst @@ -1,6 +1,6 @@ Jobs ~~~~ -.. automodule:: gcloud.bigquery.job +.. automodule:: google.cloud.bigquery.job :members: :show-inheritance: diff --git a/docs/bigquery-query.rst b/docs/bigquery-query.rst index 735964725327..d8b9da09cde0 100644 --- a/docs/bigquery-query.rst +++ b/docs/bigquery-query.rst @@ -1,6 +1,6 @@ Query ~~~~~ -.. automodule:: gcloud.bigquery.query +.. automodule:: google.cloud.bigquery.query :members: :show-inheritance: diff --git a/docs/bigquery-schema.rst b/docs/bigquery-schema.rst index cfac47ad0945..c8bf3edc18c3 100644 --- a/docs/bigquery-schema.rst +++ b/docs/bigquery-schema.rst @@ -1,7 +1,7 @@ Schemas ~~~~~~~ -.. automodule:: gcloud.bigquery.schema +.. automodule:: google.cloud.bigquery.schema :members: :show-inheritance: diff --git a/docs/bigquery-table.rst b/docs/bigquery-table.rst index 63297bb471fd..713f6116c932 100644 --- a/docs/bigquery-table.rst +++ b/docs/bigquery-table.rst @@ -1,6 +1,6 @@ Tables ~~~~~~ -.. automodule:: gcloud.bigquery.table +.. automodule:: google.cloud.bigquery.table :members: :show-inheritance: diff --git a/docs/bigquery-usage.rst b/docs/bigquery-usage.rst index 6ff904da5876..e9dc86989e5d 100644 --- a/docs/bigquery-usage.rst +++ b/docs/bigquery-usage.rst @@ -4,25 +4,25 @@ Using the API Authentication / Configuration ------------------------------ -- Use :class:`Client ` objects to configure +- Use :class:`Client ` objects to configure your applications. -- :class:`Client ` objects hold both a ``project`` +- :class:`Client ` objects hold both a ``project`` and an authenticated connection to the BigQuery service. - The authentication credentials can be implicitly determined from the environment or directly via - :meth:`from_service_account_json ` + :meth:`from_service_account_json ` and - :meth:`from_service_account_p12 `. + :meth:`from_service_account_p12 `. - After setting :envvar:`GOOGLE_APPLICATION_CREDENTIALS` and - :envvar:`GCLOUD_PROJECT` environment variables, create an instance of - :class:`Client `. + :envvar:`GOOGLE_CLOUD_PROJECT` environment variables, create an instance of + :class:`Client `. .. doctest:: - >>> from gcloud import bigquery + >>> from google.cloud import bigquery >>> client = bigquery.Client() @@ -41,7 +41,7 @@ To override the project inferred from the environment, pass an explicit .. doctest:: - >>> from gcloud import bigquery + >>> from google.cloud import bigquery >>> client = bigquery.Client(project='PROJECT_ID') @@ -103,7 +103,7 @@ Replace the ACL for a dataset, and update all writeable fields: .. doctest:: - >>> from gcloud import bigquery + >>> from google.cloud import bigquery >>> client = bigquery.Client() >>> dataset = client.dataset('dataset_name') >>> dataset.get() # API request @@ -232,7 +232,7 @@ Background a query, loading the results into a table: .. doctest:: - >>> from gcloud import bigquery + >>> from google.cloud import bigquery >>> client = bigquery.Client() >>> query = """\ SELECT firstname + ' ' + last_name AS full_name, @@ -255,7 +255,7 @@ Background a query, loading the results into a table: .. note:: - - ``gcloud.bigquery`` generates a UUID for each job. + - ``google.cloud.bigquery`` generates a UUID for each job. - The ``created`` and ``state`` fields are not set until the job is submitted to the BigQuery back-end. @@ -294,8 +294,8 @@ the job locally: .. doctest:: - >>> from gcloud import bigquery - >>> from gcloud.bigquery import SchemaField + >>> from google.cloud import bigquery + >>> from google.cloud.bigquery import SchemaField >>> client = bigquery.Client() >>> table = dataset.table(name='person_ages') >>> table.schema = [ @@ -317,7 +317,7 @@ the job locally: .. note:: - - ``gcloud.bigquery`` generates a UUID for each job. + - ``google.cloud.bigquery`` generates a UUID for each job. - The ``created`` and ``state`` fields are not set until the job is submitted to the BigQuery back-end. @@ -355,7 +355,7 @@ located on Google Cloud Storage. First, create the job locally: .. doctest:: - >>> from gcloud import bigquery + >>> from google.cloud import bigquery >>> client = bigquery.Client() >>> table = dataset.table(name='person_ages') >>> job = client.extract_table_to_storage( @@ -375,7 +375,7 @@ located on Google Cloud Storage. First, create the job locally: .. note:: - - ``gcloud.bigquery`` generates a UUID for each job. + - ``google.cloud.bigquery`` generates a UUID for each job. - The ``created`` and ``state`` fields are not set until the job is submitted to the BigQuery back-end. @@ -412,7 +412,7 @@ First, create the job locally: .. doctest:: - >>> from gcloud import bigquery + >>> from google.cloud import bigquery >>> client = bigquery.Client() >>> source_table = dataset.table(name='person_ages') >>> destination_table = dataset.table(name='person_ages_copy') @@ -429,7 +429,7 @@ First, create the job locally: .. note:: - - ``gcloud.bigquery`` generates a UUID for each job. + - ``google.cloud.bigquery`` generates a UUID for each job. - The ``created`` and ``state`` fields are not set until the job is submitted to the BigQuery back-end. diff --git a/docs/bigquery_snippets.py b/docs/bigquery_snippets.py index 811493623e16..cb772b01763e 100644 --- a/docs/bigquery_snippets.py +++ b/docs/bigquery_snippets.py @@ -15,8 +15,8 @@ """Testable usage examples for Google Cloud BigQuery API wrapper Each example function takes a ``client`` argument (which must be an instance -of :class:`gcloud.bigquery.client.Client`) and uses it to perform a task with -the API. +of :class:`google.cloud.bigquery.client.Client`) and uses it to perform a task +with the API. To facilitate running the examples as system tests, each example is also passed a ``to_delete`` list; the function adds to the list any objects created which @@ -26,8 +26,8 @@ import operator import time -from gcloud.bigquery import SchemaField -from gcloud.bigquery.client import Client +from google.cloud.bigquery import SchemaField +from google.cloud.bigquery.client import Client ORIGINAL_FRIENDLY_NAME = 'Original friendly name' ORIGINAL_DESCRIPTION = 'Original description' @@ -162,7 +162,7 @@ def dataset_update(client, to_delete): dataset.reload() # [START dataset_update] - from gcloud.bigquery import AccessGrant + from google.cloud.bigquery import AccessGrant assert dataset.description == ORIGINAL_DESCRIPTION assert dataset.default_table_expiration_ms is None grant = AccessGrant( diff --git a/docs/bigtable-client-intro.rst b/docs/bigtable-client-intro.rst index 738aa4fea543..fa759481e8ba 100644 --- a/docs/bigtable-client-intro.rst +++ b/docs/bigtable-client-intro.rst @@ -1,51 +1,51 @@ Base for Everything =================== -To use the API, the :class:`Client ` +To use the API, the :class:`Client ` class defines a high-level interface which handles authorization and creating other objects: .. code:: python - from gcloud.bigtable.client import Client + from google.cloud.bigtable.client import Client client = Client() Long-lived Defaults ------------------- -When creating a :class:`Client `, the +When creating a :class:`Client `, the ``user_agent`` argument has sensible a default -(:data:`DEFAULT_USER_AGENT `). +(:data:`DEFAULT_USER_AGENT `). However, you may over-ride it and the value will be used throughout all API requests made with the ``client`` you create. Configuration ------------- -- For an overview of authentication in ``gcloud-python``, +- For an overview of authentication in ``google-cloud-python``, see :doc:`gcloud-auth`. - In addition to any authentication configuration, you can also set the - :envvar:`GCLOUD_PROJECT` environment variable for the Google Cloud Console + :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the Google Cloud Console project you'd like to interact with. If your code is running in Google App Engine or Google Compute Engine the project will be detected automatically. (Setting this environment variable is not required, you may instead pass the ``project`` explicitly when constructing a - :class:`Client `). + :class:`Client `). - After configuring your environment, create a - :class:`Client ` + :class:`Client ` .. code:: - >>> from gcloud import bigtable + >>> from google.cloud import bigtable >>> client = bigtable.Client() or pass in ``credentials`` and ``project`` explicitly .. code:: - >>> from gcloud import bigtable + >>> from google.cloud import bigtable >>> client = bigtable.Client(project='my-project', credentials=creds) .. tip:: @@ -73,15 +73,15 @@ you can pass the ``read_only`` argument: client = bigtable.Client(read_only=True) This will ensure that the -:data:`READ_ONLY_SCOPE ` is used +:data:`READ_ONLY_SCOPE ` is used for API requests (so any accidental requests that would modify data will fail). Next Step --------- -After a :class:`Client `, the next highest-level -object is a :class:`Instance `. You'll need +After a :class:`Client `, the next highest-level +object is a :class:`Instance `. You'll need one before you can interact with tables or data. Head next to learn about the :doc:`bigtable-instance-api`. diff --git a/docs/bigtable-client.rst b/docs/bigtable-client.rst index fb2d9cec88e4..c48595c8ac0b 100644 --- a/docs/bigtable-client.rst +++ b/docs/bigtable-client.rst @@ -1,6 +1,6 @@ Client ~~~~~~ -.. automodule:: gcloud.bigtable.client +.. automodule:: google.cloud.bigtable.client :members: :show-inheritance: diff --git a/docs/bigtable-cluster.rst b/docs/bigtable-cluster.rst index 9c5276dc462a..ad33aae5e0b8 100644 --- a/docs/bigtable-cluster.rst +++ b/docs/bigtable-cluster.rst @@ -1,6 +1,6 @@ Cluster ~~~~~~~ -.. automodule:: gcloud.bigtable.cluster +.. automodule:: google.cloud.bigtable.cluster :members: :show-inheritance: diff --git a/docs/bigtable-column-family.rst b/docs/bigtable-column-family.rst index 6539e0230d15..de6c1eb1f5df 100644 --- a/docs/bigtable-column-family.rst +++ b/docs/bigtable-column-family.rst @@ -2,7 +2,7 @@ Column Families =============== When creating a -:class:`ColumnFamily `, it is +:class:`ColumnFamily `, it is possible to set garbage collection rules for expired data. By setting a rule, cells in the table matching the rule will be deleted @@ -10,19 +10,19 @@ during periodic garbage collection (which executes opportunistically in the background). The types -:class:`MaxAgeGCRule `, -:class:`MaxVersionsGCRule `, -:class:`GarbageCollectionRuleUnion ` and -:class:`GarbageCollectionRuleIntersection ` +:class:`MaxAgeGCRule `, +:class:`MaxVersionsGCRule `, +:class:`GarbageCollectionRuleUnion ` and +:class:`GarbageCollectionRuleIntersection ` can all be used as the optional ``gc_rule`` argument in the -:class:`ColumnFamily ` +:class:`ColumnFamily ` constructor. This value is then used in the -:meth:`create() ` and -:meth:`update() ` methods. +:meth:`create() ` and +:meth:`update() ` methods. These rules can be nested arbitrarily, with a -:class:`MaxAgeGCRule ` or -:class:`MaxVersionsGCRule ` +:class:`MaxAgeGCRule ` or +:class:`MaxVersionsGCRule ` at the lowest level of the nesting: .. code:: python @@ -44,6 +44,6 @@ at the lowest level of the nesting: ---- -.. automodule:: gcloud.bigtable.column_family +.. automodule:: google.cloud.bigtable.column_family :members: :show-inheritance: diff --git a/docs/bigtable-data-api.rst b/docs/bigtable-data-api.rst index 779efa991886..78cc10b0f485 100644 --- a/docs/bigtable-data-api.rst +++ b/docs/bigtable-data-api.rst @@ -1,7 +1,7 @@ Data API ======== -After creating a :class:`Table ` and some +After creating a :class:`Table ` and some column families, you are ready to store and retrieve data. Cells vs. Columns vs. Column Families @@ -27,7 +27,7 @@ Modifying Data Since data is stored in cells, which are stored in rows, we use the metaphor of a **row** in classes that are used to modify (write, update, delete) data in a -:class:`Table `. +:class:`Table `. Direct vs. Conditional vs. Append --------------------------------- @@ -38,26 +38,26 @@ methods. * The **direct** way is via `MutateRow`_ which involves simply adding, overwriting or deleting cells. The - :class:`DirectRow ` class + :class:`DirectRow ` class handles direct mutations. * The **conditional** way is via `CheckAndMutateRow`_. This method first checks if some filter is matched in a a given row, then applies one of two sets of mutations, depending on if a match occurred or not. (These mutation sets are called the "true mutations" and "false mutations".) The - :class:`ConditionalRow ` class + :class:`ConditionalRow ` class handles conditional mutations. * The **append** way is via `ReadModifyWriteRow`_. This simply appends (as bytes) or increments (as an integer) data in a presumed existing cell in a row. The - :class:`AppendRow ` class + :class:`AppendRow ` class handles append mutations. Row Factory ----------- A single factory can be used to create any of the three row types. -To create a :class:`DirectRow `: +To create a :class:`DirectRow `: .. code:: python @@ -66,15 +66,15 @@ To create a :class:`DirectRow `: Unlike the previous string values we've used before, the row key must be ``bytes``. -To create a :class:`ConditionalRow `, -first create a :class:`RowFilter ` and +To create a :class:`ConditionalRow `, +first create a :class:`RowFilter ` and then .. code:: python cond_row = table.row(row_key, filter_=filter_) -To create an :class:`AppendRow ` +To create an :class:`AppendRow ` .. code:: python @@ -95,7 +95,7 @@ Direct Mutations Direct mutations can be added via one of four methods -* :meth:`set_cell() ` allows a +* :meth:`set_cell() ` allows a single value to be written to a column .. code:: python @@ -109,7 +109,7 @@ Direct mutations can be added via one of four methods The value can either by bytes or an integer (which will be converted to bytes as a signed 64-bit integer). -* :meth:`delete_cell() ` deletes +* :meth:`delete_cell() ` deletes all cells (i.e. for all timestamps) in a given column .. code:: python @@ -119,7 +119,7 @@ Direct mutations can be added via one of four methods Remember, this only happens in the ``row`` we are using. If we only want to delete cells from a limited range of time, a - :class:`TimestampRange ` can + :class:`TimestampRange ` can be used .. code:: python @@ -127,9 +127,9 @@ Direct mutations can be added via one of four methods row.delete_cell(column_family_id, column, time_range=time_range) -* :meth:`delete_cells() ` does +* :meth:`delete_cells() ` does the same thing as - :meth:`delete_cell() ` + :meth:`delete_cell() ` but accepts a list of columns in a column family rather than a single one. .. code:: python @@ -138,7 +138,7 @@ Direct mutations can be added via one of four methods time_range=time_range) In addition, if we want to delete cells from every column in a column family, - the special :attr:`ALL_COLUMNS ` + the special :attr:`ALL_COLUMNS ` value can be used .. code:: python @@ -146,7 +146,7 @@ Direct mutations can be added via one of four methods row.delete_cells(column_family_id, row.ALL_COLUMNS, time_range=time_range) -* :meth:`delete() ` will delete the +* :meth:`delete() ` will delete the entire row .. code:: python @@ -177,14 +177,14 @@ Append Mutations Append mutations can be added via one of two methods -* :meth:`append_cell_value() ` +* :meth:`append_cell_value() ` appends a bytes value to an existing cell: .. code:: python append_row.append_cell_value(column_family_id, column, bytes_value) -* :meth:`increment_cell_value() ` +* :meth:`increment_cell_value() ` increments an integer value in an existing cell: .. code:: python @@ -217,7 +217,7 @@ Read Single Row from a Table ---------------------------- To make a `ReadRows`_ API request for a single row key, use -:meth:`Table.read_row() `: +:meth:`Table.read_row() `: .. code:: python @@ -226,34 +226,34 @@ To make a `ReadRows`_ API request for a single row key, use { u'fam1': { b'col1': [ - , - , + , + , ], b'col2': [ - , + , ], }, u'fam2': { b'col3': [ - , - , - , + , + , + , ], }, } >>> cell = row_data.cells[u'fam1'][b'col1'][0] >>> cell - + >>> cell.value b'val1' >>> cell.timestamp datetime.datetime(2016, 2, 27, 3, 41, 18, 122823, tzinfo=) -Rather than returning a :class:`DirectRow ` +Rather than returning a :class:`DirectRow ` or similar class, this method returns a -:class:`PartialRowData ` +:class:`PartialRowData ` instance. This class is used for reading and parsing data rather than for -modifying data (as :class:`DirectRow ` is). +modifying data (as :class:`DirectRow ` is). A filter can also be applied to the results: @@ -262,15 +262,15 @@ A filter can also be applied to the results: row_data = table.read_row(row_key, filter_=filter_val) The allowable ``filter_`` values are the same as those used for a -:class:`ConditionalRow `. For +:class:`ConditionalRow `. For more information, see the -:meth:`Table.read_row() ` documentation. +:meth:`Table.read_row() ` documentation. Stream Many Rows from a Table ----------------------------- To make a `ReadRows`_ API request for a stream of rows, use -:meth:`Table.read_rows() `: +:meth:`Table.read_rows() `: .. code:: python @@ -279,32 +279,32 @@ To make a `ReadRows`_ API request for a stream of rows, use Using gRPC over HTTP/2, a continual stream of responses will be delivered. In particular -* :meth:`consume_next() ` +* :meth:`consume_next() ` pulls the next result from the stream, parses it and stores it on the - :class:`PartialRowsData ` instance -* :meth:`consume_all() ` + :class:`PartialRowsData ` instance +* :meth:`consume_all() ` pulls results from the stream until there are no more -* :meth:`cancel() ` closes +* :meth:`cancel() ` closes the stream -See the :class:`PartialRowsData ` +See the :class:`PartialRowsData ` documentation for more information. As with -:meth:`Table.read_row() `, an optional +:meth:`Table.read_row() `, an optional ``filter_`` can be applied. In addition a ``start_key`` and / or ``end_key`` can be supplied for the stream, a ``limit`` can be set and a boolean ``allow_row_interleaving`` can be specified to allow faster streamed results at the potential cost of non-sequential reads. -See the :meth:`Table.read_rows() ` +See the :meth:`Table.read_rows() ` documentation for more information on the optional arguments. Sample Keys in a Table ---------------------- Make a `SampleRowKeys`_ API request with -:meth:`Table.sample_row_keys() `: +:meth:`Table.sample_row_keys() `: .. code:: python @@ -315,7 +315,7 @@ approximately equal size, which can be used to break up the data for distributed tasks like mapreduces. As with -:meth:`Table.read_rows() `, the +:meth:`Table.read_rows() `, the returned ``keys_iterator`` is connected to a cancellable HTTP/2 stream. The next key in the result can be accessed via diff --git a/docs/bigtable-instance-api.rst b/docs/bigtable-instance-api.rst index 75eba3c3b121..18a772a59b09 100644 --- a/docs/bigtable-instance-api.rst +++ b/docs/bigtable-instance-api.rst @@ -1,7 +1,7 @@ Instance Admin API ================== -After creating a :class:`Client `, you can +After creating a :class:`Client `, you can interact with individual instances for a project. List Instances @@ -9,7 +9,7 @@ List Instances If you want a comprehensive list of all existing instances, make a `ListInstances`_ API request with -:meth:`Client.list_instances() `: +:meth:`Client.list_instances() `: .. code:: python @@ -18,7 +18,7 @@ If you want a comprehensive list of all existing instances, make a Instance Factory ---------------- -To create a :class:`Instance ` object: +To create a :class:`Instance ` object: .. code:: python @@ -45,7 +45,7 @@ Create a new Instance --------------------- After creating the instance object, make a `CreateInstance`_ API request -with :meth:`create() `: +with :meth:`create() `: .. code:: python @@ -59,14 +59,14 @@ Check on Current Operation When modifying a instance (via a `CreateInstance`_ request), the Bigtable API will return a `long-running operation`_ and a corresponding - :class:`Operation ` object + :class:`Operation ` object will be returned by - :meth:`create() `. + :meth:`create() `. You can check if a long-running operation (for a -:meth:`create() ` has finished +:meth:`create() ` has finished by making a `GetOperation`_ request with -:meth:`Operation.finished() `: +:meth:`Operation.finished() `: .. code:: python @@ -76,18 +76,18 @@ by making a `GetOperation`_ request with .. note:: - Once an :class:`Operation ` object + Once an :class:`Operation ` object has returned :data:`True` from - :meth:`finished() `, the + :meth:`finished() `, the object should not be re-used. Subsequent calls to - :meth:`finished() ` + :meth:`finished() ` will result in a :class:`ValueError `. Get metadata for an existing Instance ------------------------------------- After creating the instance object, make a `GetInstance`_ API request -with :meth:`reload() `: +with :meth:`reload() `: .. code:: python @@ -99,7 +99,7 @@ Update an existing Instance --------------------------- After creating the instance object, make an `UpdateInstance`_ API request -with :meth:`update() `: +with :meth:`update() `: .. code:: python @@ -110,7 +110,7 @@ Delete an existing Instance --------------------------- Make a `DeleteInstance`_ API request with -:meth:`delete() `: +:meth:`delete() `: .. code:: python @@ -120,8 +120,8 @@ Next Step --------- Now we go down the hierarchy from -:class:`Instance ` to a -:class:`Table `. +:class:`Instance ` to a +:class:`Table `. Head next to learn about the :doc:`bigtable-table-api`. diff --git a/docs/bigtable-instance.rst b/docs/bigtable-instance.rst index 2b4c8e6c1fa9..f9be9672fc64 100644 --- a/docs/bigtable-instance.rst +++ b/docs/bigtable-instance.rst @@ -1,6 +1,6 @@ Instance ~~~~~~~~ -.. automodule:: gcloud.bigtable.instance +.. automodule:: google.cloud.bigtable.instance :members: :show-inheritance: diff --git a/docs/bigtable-row-data.rst b/docs/bigtable-row-data.rst index 3564f4e7a4b4..503f9b1cbdfd 100644 --- a/docs/bigtable-row-data.rst +++ b/docs/bigtable-row-data.rst @@ -1,6 +1,6 @@ Row Data ~~~~~~~~ -.. automodule:: gcloud.bigtable.row_data +.. automodule:: google.cloud.bigtable.row_data :members: :show-inheritance: diff --git a/docs/bigtable-row-filters.rst b/docs/bigtable-row-filters.rst index 9796a4c27239..4a0112f2f519 100644 --- a/docs/bigtable-row-filters.rst +++ b/docs/bigtable-row-filters.rst @@ -2,11 +2,11 @@ Bigtable Row Filters ==================== It is possible to use a -:class:`RowFilter ` +:class:`RowFilter ` when adding mutations to a -:class:`ConditionalRow ` and when -reading row data with :meth:`read_row() ` -:meth:`read_rows() `. +:class:`ConditionalRow ` and when +reading row data with :meth:`read_row() ` +:meth:`read_rows() `. As laid out in the `RowFilter definition`_, the following basic filters are provided: @@ -60,7 +60,7 @@ level. For example: ---- -.. automodule:: gcloud.bigtable.row_filters +.. automodule:: google.cloud.bigtable.row_filters :members: :show-inheritance: diff --git a/docs/bigtable-row.rst b/docs/bigtable-row.rst index afb52f39782b..33686608b363 100644 --- a/docs/bigtable-row.rst +++ b/docs/bigtable-row.rst @@ -1,7 +1,7 @@ Bigtable Row ============ -.. automodule:: gcloud.bigtable.row +.. automodule:: google.cloud.bigtable.row :members: :show-inheritance: :inherited-members: diff --git a/docs/bigtable-table-api.rst b/docs/bigtable-table-api.rst index e29c7935ef46..0d5edcd64bf2 100644 --- a/docs/bigtable-table-api.rst +++ b/docs/bigtable-table-api.rst @@ -1,7 +1,7 @@ Table Admin API =============== -After creating a :class:`Instance `, you can +After creating a :class:`Instance `, you can interact with individual tables, groups of tables or column families within a table. @@ -10,33 +10,33 @@ List Tables If you want a comprehensive list of all existing tables in a instance, make a `ListTables`_ API request with -:meth:`Instance.list_tables() `: +:meth:`Instance.list_tables() `: .. code:: python >>> instance.list_tables() - [, - ] + [, + ] Table Factory ------------- -To create a :class:`Table ` object: +To create a :class:`Table ` object: .. code:: python table = instance.table(table_id) -Even if this :class:`Table ` already +Even if this :class:`Table ` already has been created with the API, you'll want this object to use as a -parent of a :class:`ColumnFamily ` -or :class:`Row `. +parent of a :class:`ColumnFamily ` +or :class:`Row `. Create a new Table ------------------ After creating the table object, make a `CreateTable`_ API request -with :meth:`create() `: +with :meth:`create() `: .. code:: python @@ -53,7 +53,7 @@ Delete an existing Table ------------------------ Make a `DeleteTable`_ API request with -:meth:`delete() `: +:meth:`delete() `: .. code:: python @@ -67,7 +67,7 @@ associated with a table, the `GetTable`_ API method returns a table object with the names of the column families. To retrieve the list of column families use -:meth:`list_column_families() `: +:meth:`list_column_families() `: .. code:: python @@ -77,7 +77,7 @@ Column Family Factory --------------------- To create a -:class:`ColumnFamily ` object: +:class:`ColumnFamily ` object: .. code:: python @@ -87,7 +87,7 @@ There is no real reason to use this factory unless you intend to create or delete a column family. In addition, you can specify an optional ``gc_rule`` (a -:class:`GarbageCollectionRule ` +:class:`GarbageCollectionRule ` or similar): .. code:: python @@ -99,7 +99,7 @@ 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 -:class:`GarbageCollectionRule ` +:class:`GarbageCollectionRule ` and related classes. Create a new Column Family @@ -107,7 +107,7 @@ Create a new Column Family After creating the column family object, make a `CreateColumnFamily`_ API request with -:meth:`ColumnFamily.create() ` +:meth:`ColumnFamily.create() ` .. code:: python @@ -117,7 +117,7 @@ Delete an existing Column Family -------------------------------- Make a `DeleteColumnFamily`_ API request with -:meth:`ColumnFamily.delete() ` +:meth:`ColumnFamily.delete() ` .. code:: python @@ -127,7 +127,7 @@ Update an existing Column Family -------------------------------- Make an `UpdateColumnFamily`_ API request with -:meth:`ColumnFamily.delete() ` +:meth:`ColumnFamily.delete() ` .. code:: python @@ -137,9 +137,9 @@ Next Step --------- Now we go down the final step of the hierarchy from -:class:`Table ` to -:class:`Row ` as well as streaming -data directly via a :class:`Table `. +:class:`Table ` to +:class:`Row ` as well as streaming +data directly via a :class:`Table `. Head next to learn about the :doc:`bigtable-data-api`. diff --git a/docs/bigtable-table.rst b/docs/bigtable-table.rst index 93704aae5d3a..c230725d1351 100644 --- a/docs/bigtable-table.rst +++ b/docs/bigtable-table.rst @@ -1,6 +1,6 @@ Table ~~~~~ -.. automodule:: gcloud.bigtable.table +.. automodule:: google.cloud.bigtable.table :members: :show-inheritance: diff --git a/docs/bigtable-usage.rst b/docs/bigtable-usage.rst index eb29ccacdc91..157c339d166b 100644 --- a/docs/bigtable-usage.rst +++ b/docs/bigtable-usage.rst @@ -6,19 +6,19 @@ In order to support this, we'll rely on `gRPC`_. We are working with the gRPC team to rapidly make the install story more user-friendly. Get started by learning about the -:class:`Client ` on the +:class:`Client ` on the :doc:`bigtable-client-intro` page. In the hierarchy of API concepts -* a :class:`Client ` owns a - :class:`Cluster ` -* a :class:`Table ` owns a - :class:`ColumnFamily ` -* a :class:`Table ` owns a - :class:`Row ` +* a :class:`Client ` owns a + :class:`Cluster ` +* a :class:`Table ` owns a + :class:`ColumnFamily ` +* a :class:`Table ` owns a + :class:`Row ` (and all the cells in the row) .. _Google Cloud Bigtable: https://cloud.google.com/bigtable/docs/ diff --git a/docs/conf.py b/docs/conf.py index b105e9a3e5d9..078cfd6b70c0 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# gcloud documentation build configuration file, created by +# google-cloud documentation build configuration file, created by # sphinx-quickstart on Tue Jan 21 22:24:47 2014. # # This file is execfile()d with the current directory set to its containing dir. @@ -56,7 +56,7 @@ master_doc = 'index' # General information about the project. -project = u'gcloud' +project = u'google-cloud' copyright = u'2014, Google' # The version info for the project you're documenting, acts as replacement for @@ -64,7 +64,7 @@ # built documents. # # The short X.Y version. -distro = get_distribution('gcloud') +distro = get_distribution('google-cloud') release = os.getenv('SPHINX_RELEASE', distro.version) # The language for content autogenerated by Sphinx. Refer to documentation @@ -184,7 +184,7 @@ #html_file_suffix = None # Output file base name for HTML help builder. -htmlhelp_basename = 'gclouddoc' +htmlhelp_basename = 'google-cloud-doc' html_context = {} @@ -207,7 +207,7 @@ # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('index', 'gcloud.tex', u'gCloud Documentation', + ('index', 'google-cloud.tex', u'google-cloud Documentation', author, 'manual'), ] @@ -237,7 +237,7 @@ # One entry per manual page. List of tuples # (source start file, name, description, authors, manual section). man_pages = [ - ('index', 'gcloud', u'gCloud Documentation', + ('index', 'google-cloud', u'google-cloud Documentation', [author], 1) ] @@ -251,8 +251,8 @@ # (source start file, target name, title, author, # dir menu entry, description, category) texinfo_documents = [ - ('index', 'gcloud', u'gCloud Documentation', - author, 'gcloud', 'Python API for Google Cloud.', + ('index', 'google-cloud', u'google-cloud Documentation', + author, 'google-cloud', 'Python API for Google Cloud.', 'Miscellaneous'), ] @@ -269,7 +269,7 @@ # and parameter definitions from the __init__ docstring. autoclass_content = 'both' -issue_uri = ('https://github.com/GoogleCloudPlatform/gcloud-python/issues/' +issue_uri = ('https://github.com/GoogleCloudPlatform/google-cloud-python/issues/' 'new?' + urllib.urlencode({'title': '[Documentation Issue] '})) issue_uri_template = ( issue_uri + '&' + urllib.urlencode({'body': 'Page Name: '}) + '{0}' + diff --git a/docs/datastore-batches.rst b/docs/datastore-batches.rst index bf7d5c4ffbcc..4a2b0eb7d761 100644 --- a/docs/datastore-batches.rst +++ b/docs/datastore-batches.rst @@ -1,6 +1,6 @@ Batches ~~~~~~~ -.. automodule:: gcloud.datastore.batch +.. automodule:: google.cloud.datastore.batch :members: :show-inheritance: diff --git a/docs/datastore-client.rst b/docs/datastore-client.rst index 23c489dd11c6..924fa5d789a5 100644 --- a/docs/datastore-client.rst +++ b/docs/datastore-client.rst @@ -1,13 +1,13 @@ Datastore Client ================ -.. automodule:: gcloud.datastore.client +.. automodule:: google.cloud.datastore.client :members: :show-inheritance: Connection ~~~~~~~~~~ -.. automodule:: gcloud.datastore.connection +.. automodule:: google.cloud.datastore.connection :members: :show-inheritance: diff --git a/docs/datastore-entities.rst b/docs/datastore-entities.rst index 6e263ceeda0e..dc8217ddf3ba 100644 --- a/docs/datastore-entities.rst +++ b/docs/datastore-entities.rst @@ -1,6 +1,6 @@ Entities ~~~~~~~~ -.. automodule:: gcloud.datastore.entity +.. automodule:: google.cloud.datastore.entity :members: :show-inheritance: diff --git a/docs/datastore-helpers.rst b/docs/datastore-helpers.rst index a70e4d2cf534..99f9b9bf28bc 100644 --- a/docs/datastore-helpers.rst +++ b/docs/datastore-helpers.rst @@ -1,6 +1,6 @@ Helpers ~~~~~~~ -.. automodule:: gcloud.datastore.helpers +.. automodule:: google.cloud.datastore.helpers :members: :show-inheritance: diff --git a/docs/datastore-keys.rst b/docs/datastore-keys.rst index c202471d252d..79f7a7eb4e38 100644 --- a/docs/datastore-keys.rst +++ b/docs/datastore-keys.rst @@ -1,6 +1,6 @@ Keys ~~~~ -.. automodule:: gcloud.datastore.key +.. automodule:: google.cloud.datastore.key :members: :show-inheritance: diff --git a/docs/datastore-queries.rst b/docs/datastore-queries.rst index 4ffed79925fa..aa9e7dfb7193 100644 --- a/docs/datastore-queries.rst +++ b/docs/datastore-queries.rst @@ -1,6 +1,6 @@ Queries ~~~~~~~ -.. automodule:: gcloud.datastore.query +.. automodule:: google.cloud.datastore.query :members: :show-inheritance: diff --git a/docs/datastore-transactions.rst b/docs/datastore-transactions.rst index d86d7fd74c71..1737a7bf5994 100644 --- a/docs/datastore-transactions.rst +++ b/docs/datastore-transactions.rst @@ -1,7 +1,7 @@ Transactions ~~~~~~~~~~~~ -.. automodule:: gcloud.datastore.transaction +.. automodule:: google.cloud.datastore.transaction :members: :show-inheritance: :inherited-members: diff --git a/docs/dns-changes.rst b/docs/dns-changes.rst index 40dc0dddc257..9510ebbcc013 100644 --- a/docs/dns-changes.rst +++ b/docs/dns-changes.rst @@ -1,6 +1,6 @@ Change Sets ~~~~~~~~~~~ -.. automodule:: gcloud.dns.changes +.. automodule:: google.cloud.dns.changes :members: :show-inheritance: diff --git a/docs/dns-client.rst b/docs/dns-client.rst index e499c2d0eeff..337ac6558859 100644 --- a/docs/dns-client.rst +++ b/docs/dns-client.rst @@ -1,13 +1,13 @@ DNS Client ========== -.. automodule:: gcloud.dns.client +.. automodule:: google.cloud.dns.client :members: :show-inheritance: Connection ~~~~~~~~~~ -.. automodule:: gcloud.dns.connection +.. automodule:: google.cloud.dns.connection :members: :show-inheritance: diff --git a/docs/dns-resource-record-set.rst b/docs/dns-resource-record-set.rst index ff46e6c7f1ee..1112d16aaa4f 100644 --- a/docs/dns-resource-record-set.rst +++ b/docs/dns-resource-record-set.rst @@ -1,6 +1,6 @@ Resource Record Sets ~~~~~~~~~~~~~~~~~~~~ -.. automodule:: gcloud.dns.resource_record_set +.. automodule:: google.cloud.dns.resource_record_set :members: :show-inheritance: diff --git a/docs/dns-usage.rst b/docs/dns-usage.rst index 2058a52dd3c3..d0f5415282fa 100644 --- a/docs/dns-usage.rst +++ b/docs/dns-usage.rst @@ -4,18 +4,18 @@ Using the API Client ------ -:class:`Client ` objects provide a means to +:class:`Client ` objects provide a means to configure your DNS applications. Each instance holds both a ``project`` and an authenticated connection to the DNS service. -For an overview of authentication in ``gcloud-python``, see :doc:`gcloud-auth`. +For an overview of authentication in ``google-cloud-python``, see :doc:`gcloud-auth`. Assuming your environment is set up as described in that document, -create an instance of :class:`Client `. +create an instance of :class:`Client `. .. doctest:: - >>> from gcloud import dns + >>> from google.cloud import dns >>> client = dns.Client() Projects @@ -33,7 +33,7 @@ To override the project inferred from the environment, pass an explicit .. doctest:: - >>> from gcloud import dns + >>> from google.cloud import dns >>> client = dns.Client(project='PROJECT_ID') Project Quotas @@ -43,7 +43,7 @@ Query the quotas for a given project: .. doctest:: - >>> from gcloud import dns + >>> from google.cloud import dns >>> client = dns.Client(project='PROJECT_ID') >>> quotas = client.quotas() # API request >>> for key, value in sorted(quotas.items()): @@ -72,7 +72,7 @@ suffix and has a set of name servers that accept and responds to queries: .. doctest:: - >>> from gcloud import dns + >>> from google.cloud import dns >>> client = dns.Client(project='PROJECT_ID') >>> zone = client.zone('acme-co', 'example.com', ... description='Acme Company zone') @@ -87,7 +87,7 @@ List the zones for a given project: .. doctest:: - >>> from gcloud import dns + >>> from google.cloud import dns >>> client = dns.Client(project='PROJECT_ID') >>> zones = client.list_zones() # API request >>> [zone.name for zone in zones] @@ -101,7 +101,7 @@ Each managed zone exposes a read-only set of resource records: .. doctest:: - >>> from gcloud import dns + >>> from google.cloud import dns >>> client = dns.Client(project='PROJECT_ID') >>> zone = client.zone('acme-co', 'example.com') >>> records, page_token = zone.list_resource_record_sets() # API request @@ -135,7 +135,7 @@ bundling additions to or deletions from the set. .. doctest:: >>> import time - >>> from gcloud import dns + >>> from google.cloud import dns >>> client = dns.Client(project='PROJECT_ID') >>> zone = client.zone('acme-co', 'example.com') >>> TWO_HOURS = 2 * 60 * 60 # seconds @@ -154,7 +154,7 @@ List changes made to the resource record set for a given zone: .. doctest:: - >>> from gcloud import dns + >>> from google.cloud import dns >>> client = dns.Client(project='PROJECT_ID') >>> zone = client.zone('acme-co', 'example.com') >>> changes = [] diff --git a/docs/dns-zone.rst b/docs/dns-zone.rst index 22cb456b56f6..b65081f00a92 100644 --- a/docs/dns-zone.rst +++ b/docs/dns-zone.rst @@ -1,6 +1,6 @@ Managed Zones ~~~~~~~~~~~~~ -.. automodule:: gcloud.dns.zone +.. automodule:: google.cloud.dns.zone :members: :show-inheritance: diff --git a/docs/error-reporting-client.rst b/docs/error-reporting-client.rst index 55092baa0880..4f4d08a16872 100644 --- a/docs/error-reporting-client.rst +++ b/docs/error-reporting-client.rst @@ -1,7 +1,7 @@ Error Reporting Client ======================= -.. automodule:: gcloud.error_reporting.client +.. automodule:: google.cloud.error_reporting.client :members: :show-inheritance: diff --git a/docs/error-reporting-usage.rst b/docs/error-reporting-usage.rst index c5dd5f451046..c07c35a9070b 100644 --- a/docs/error-reporting-usage.rst +++ b/docs/error-reporting-usage.rst @@ -5,27 +5,27 @@ Using the API Authentication and Configuration -------------------------------- -- For an overview of authentication in ``gcloud-python``, +- For an overview of authentication in ``google-cloud-python``, see :doc:`gcloud-auth`. - In addition to any authentication configuration, you should also set the - :envvar:`GCLOUD_PROJECT` environment variable for the project you'd like + :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd like to interact with. If you are Google App Engine or Google Compute Engine this will be detected automatically. - After configuring your environment, create a - :class:`Client ` + :class:`Client ` .. doctest:: - >>> from gcloud import error_reporting + >>> from google.cloud import error_reporting >>> client = error_reporting.Client() or pass in ``credentials`` and ``project`` explicitly .. doctest:: - >>> from gcloud import error_reporting + >>> from google.cloud import error_reporting >>> client = error_reporting.Client(project='my-project', credentials=creds) Error Reporting associates errors with a service, which is an identifier for an executable, @@ -36,7 +36,7 @@ Authentication and Configuration .. doctest:: - >>> from gcloud import error_reporting + >>> from google.cloud import error_reporting >>> client = error_reporting.Client(project='my-project', ... service="login_service", ... version="0.1.0") @@ -48,7 +48,7 @@ Report a stacktrace to Stackdriver Error Reporting after an exception .. doctest:: - >>> from gcloud import error_reporting + >>> from google.cloud import error_reporting >>> client = error_reporting.Client() >>> try: >>> raise NameError @@ -60,12 +60,12 @@ By default, the client will report the error using the service specified in the constructor, or the default service of "python". The user and HTTP context can also be included in the exception. The HTTP context -can be constructed using :class:`gcloud.error_reporting.HTTPContext`. This will +can be constructed using :class:`google.cloud.error_reporting.HTTPContext`. This will be used by Stackdriver Error Reporting to help group exceptions. .. doctest:: - >>> from gcloud import error_reporting + >>> from google.cloud import error_reporting >>> client = error_reporting.Client() >>> user = 'example@gmail.com' >>> http_context = HTTPContext(method='GET', url='/', userAgent='test agent', @@ -85,7 +85,7 @@ error was reported. .. doctest:: - >>> from gcloud import error_reporting + >>> from google.cloud import error_reporting >>> client = error_reporting.Client() >>> error_reporting.report("Found an error!") @@ -93,7 +93,7 @@ Similarly to reporting an exception, the user and HTTP context can be provided: .. doctest:: - >>> from gcloud import error_reporting + >>> from google.cloud import error_reporting >>> client = error_reporting.Client() >>> user = 'example@gmail.com' >>> http_context = HTTPContext(method='GET', url='/', userAgent='test agent', diff --git a/docs/gcloud-api.rst b/docs/gcloud-api.rst index 7226dd59c3bf..0fb79d966cfb 100644 --- a/docs/gcloud-api.rst +++ b/docs/gcloud-api.rst @@ -4,7 +4,7 @@ Shared Core Modules Base Client ~~~~~~~~~~~ -.. automodule:: gcloud.client +.. automodule:: google.cloud.client :members: :show-inheritance: :inherited-members: @@ -12,27 +12,27 @@ Base Client Credentials Helpers ~~~~~~~~~~~~~~~~~~~ -.. automodule:: gcloud.credentials +.. automodule:: google.cloud.credentials :members: :show-inheritance: Base Connections ~~~~~~~~~~~~~~~~ -.. automodule:: gcloud.connection +.. automodule:: google.cloud.connection :members: :show-inheritance: Exceptions ~~~~~~~~~~ -.. automodule:: gcloud.exceptions +.. automodule:: google.cloud.exceptions :members: :show-inheritance: Environment Variables ~~~~~~~~~~~~~~~~~~~~~ -.. automodule:: gcloud.environment_vars +.. automodule:: google.cloud.environment_vars :members: :show-inheritance: diff --git a/docs/gcloud-auth.rst b/docs/gcloud-auth.rst index c5b10b8a6763..2b65a58c785f 100644 --- a/docs/gcloud-auth.rst +++ b/docs/gcloud-auth.rst @@ -22,7 +22,9 @@ Overview $ gcloud auth login - Previously, `gcloud auth login` was used for both use cases. If your gcloud installation does not support the new command, please update it: + Previously, ``gcloud auth login`` was used for both use cases. If + your ``gcloud`` installation does not support the new command, + please update it: .. code-block:: bash @@ -44,13 +46,13 @@ Overview Client-Provided Authentication ============================== -Every package uses a :class:`Client ` +Every package uses a :class:`Client ` as a base for interacting with an API. For example: .. code-block:: python - from gcloud import datastore + from google.cloud import datastore client = datastore.Client() Passing no arguments at all will "just work" if you've followed the @@ -94,7 +96,7 @@ In these situations, you can create an explicit :class:`Credentials ` object suited to your environment. After creation, -you can pass it directly to a :class:`Client `: +you can pass it directly to a :class:`Client `: .. code:: python @@ -133,10 +135,10 @@ a PKCS12/P12 keyfile. Directly creating ``credentials`` in `oauth2client`_ for a service account is a rather complex process, so as a convenience, the -:meth:`from_service_account_json() ` +:meth:`from_service_account_json() ` and -:meth:`from_service_account_p12() ` -factories are provided to create a :class:`Client ` with +:meth:`from_service_account_p12() ` +factories are provided to create a :class:`Client ` with service account credentials. .. _oauth2client: http://oauth2client.readthedocs.org/en/latest/ @@ -167,7 +169,7 @@ possible to call Google Cloud APIs with a user account via A production application should **use a service account**, but you may wish to use your own personal user account when first - getting started with the ``gcloud-python`` library. + getting started with the ``google-cloud-python`` library. The simplest way to use credentials from a user account is via Application Default Credentials using ``gcloud auth login`` @@ -305,11 +307,11 @@ you add the correct scopes for the APIs you want to access: Advanced Customization ====================== -Though the ``gcloud-python`` library defaults to using `oauth2client`_ +Though the ``google-cloud-python`` library defaults to using `oauth2client`_ to sign requests and ``httplib2`` for sending requests, it is not a strict requirement. -The :class:`Client ` constructor accepts an optional +The :class:`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. @@ -329,10 +331,10 @@ we only use it as http.request(uri, method=method_name, body=body, headers=headers) For an example of such an implementation, -a ``gcloud-python`` user created a `custom HTTP class`_ +a ``google-cloud-python`` user created a `custom HTTP class`_ using the `requests`_ library. -.. _custom HTTP class: https://github.com/GoogleCloudPlatform/gcloud-python/issues/908#issuecomment-110811556 +.. _custom HTTP class: https://github.com/GoogleCloudPlatform/google-cloud-python/issues/908#issuecomment-110811556 .. _requests: http://www.python-requests.org/en/latest/ As for handling authentication on your own, diff --git a/docs/gcloud-config.rst b/docs/gcloud-config.rst index 8d30d7573cdb..53132629cfcd 100644 --- a/docs/gcloud-config.rst +++ b/docs/gcloud-config.rst @@ -10,13 +10,13 @@ For example: .. code-block:: python - >>> from gcloud import bigquery + >>> from google.cloud import bigquery >>> client = bigquery.Client() When creating a client in this way, the project ID will be determined by searching these locations in the following order. -* GCLOUD_PROJECT environment variable +* GOOGLE_CLOUD_PROJECT environment variable * GOOGLE_APPLICATION_CREDENTIALS JSON file * Default service configuration path from ``$ gcloud beta auth application-default login``. @@ -28,7 +28,7 @@ You can override the detection of your default project by setting the .. code-block:: python - >>> from gcloud import bigquery + >>> from google.cloud import bigquery >>> client = bigquery.Client(project='my-project') You can see what project ID a client is referencing by accessing the ``project`` @@ -49,7 +49,7 @@ Logging in via ``gcloud beta auth application-default login`` will automatically configure a JSON key file with your default project ID and credentials. -Setting the ``GOOGLE_APPLICATION_CREDENTIALS`` and ``GCLOUD_PROJECT`` +Setting the ``GOOGLE_APPLICATION_CREDENTIALS`` and ``GOOGLE_CLOUD_PROJECT`` environment variables will override the automatically configured credentials. You can change your default project ID to ``my-new-default-project`` by diff --git a/docs/index.rst b/docs/index.rst index 45ed9fa7dc4b..edcf978c47f7 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,7 +1,7 @@ .. toctree:: :maxdepth: 0 :hidden: - :caption: gcloud + :caption: google-cloud gcloud-api gcloud-config @@ -167,27 +167,27 @@ :hidden: :caption: External Links - GitHub - Issues - Stack Overflow - PyPI + GitHub + Issues + Stack Overflow + PyPI Getting started --------------- -The ``gcloud`` library is ``pip`` install-able: +The ``google-cloud`` library is ``pip`` install-able: .. code-block:: console - $ pip install gcloud + $ pip install google-cloud -If you want to install ``gcloud-python`` from source, +If you want to install ``google-cloud-python`` from source, you can clone the repository from GitHub: .. code-block:: console - $ git clone git://github.com/GoogleCloudPlatform/gcloud-python.git - $ cd gcloud-python + $ git clone git://github.com/GoogleCloudPlatform/google-cloud-python.git + $ cd google-cloud-python $ python setup.py install ---- @@ -201,7 +201,7 @@ Cloud Datastore .. code-block:: python - from gcloud import datastore + from google.cloud import datastore client = datastore.Client() key = client.key('Person') @@ -220,7 +220,7 @@ Cloud Storage .. code-block:: python - from gcloud import storage + from google.cloud import storage client = storage.Client() bucket = client.get_bucket('') diff --git a/docs/json/json/home.html b/docs/json/json/home.html index 060c164597a6..762625468340 100644 --- a/docs/json/json/home.html +++ b/docs/json/json/home.html @@ -1,7 +1,7 @@
-

gcloud-python

+

google-cloud-python

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 @@ -9,7 +9,7 @@

gcloud-python

- 
$ pip install --upgrade gcloud
+ 
$ pip install --upgrade google-cloud

Latest Release {{home.latestRelease.name}} {{home.latestRelease.date|date}} @@ -22,31 +22,31 @@

  • - + Python icon Read the Docs
  • - + GitHub icon GitHub
  • - + GitHub icon Issues
  • - + StackOverflow icon StackOverflow
  • - + pypi icon PyPI @@ -60,7 +60,7 @@

    What is it?

    -

    gcloud-python is a client library for accessing Google +

    google-cloud-python 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 @@ -69,7 +69,7 @@

    What is it?

    All this means you spend more time creating code that matters to you.

    -

    gcloud-python is configured to access Google Cloud Platform +

    google-cloud-python 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 @@ -79,7 +79,7 @@

    What is it?

    Retrieve Datastore Entities

    - 
    from gcloud import datastore
+      
    from google.cloud import datastore
 
 client = datastore.Client()
 product_key = client.key('Product', 123)
@@ -94,7 +94,7 @@ 
    Examples
    @@ -104,22 +104,22 @@

    Examples

    FAQ

    -

    What is the relationship between the gcloud-python package - and the gcloud command-line tool?

    -

    Both the gcloud command-line tool and - gcloud-python package are a part of the Google Cloud SDK: a collection +

    What is the relationship between the google-cloud-python package + and the google-cloud command-line tool?

    +

    Both the google-cloud command-line tool and + google-cloud-python 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 gcloud command-line + resources on the Google Cloud Platform. The google-cloud command-line tool can be used to manage both your development workflow and your - Google Cloud Platform resources while the gcloud-python package is the + Google Cloud Platform resources while the google-cloud-python package is the Google Cloud Client Library for Python.

    -

    What is the relationship between gcloud-python +

    What is the relationship between google-cloud-python and the Google APIs Python Client?

    The Google APIs Python Client is a client library for using the broad set of Google APIs. - gcloud-python is built specifically for the Google Cloud Platform + google-cloud-python 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.

    diff --git a/docs/json/json/master/index.json b/docs/json/json/master/index.json index 8c79605c9666..1526595856f1 100644 --- a/docs/json/json/master/index.json +++ b/docs/json/json/master/index.json @@ -1,10 +1,10 @@ { - "description": "

    gcloud-python

    GCloud API access in idiomatic Python.

    ", + "description": "

    google-cloud-python

    Google Cloud API access in idiomatic Python.

    ", "examples": [ - "import gcloud" + "import google.cloud" ], - "id": "gcloud.__init__", + "id": "google.cloud.__init__", "methods": [], "name": "__Init__", - "source": "/gcloud/__init__.py" + "source": "/google/cloud/__init__.py" } diff --git a/docs/json/json/master/overview.html b/docs/json/json/master/overview.html index 0eb676c5c5b3..21cc46ad4f73 100644 --- a/docs/json/json/master/overview.html +++ b/docs/json/json/master/overview.html @@ -1,21 +1,21 @@

    Getting started

    -The gcloud library is pip install-able: +The google-cloud library is pip install-able:

    - $ pip install gcloud + $ pip install google-cloud

    -If you want to install gcloud-python from source, +If you want to install google-cloud-python from source, you can clone the repository from GitHub:

    - $ git clone git://github.com/GoogleCloudPlatform/gcloud-python.git - $ cd gcloud-python + $ git clone git://github.com/GoogleCloudPlatform/google-cloud-python.git + $ cd google-cloud-python $ python setup.py install
    @@ -30,7 +30,7 @@

    Cloud Datastore

    - from gcloud import datastore + from google.cloud import datastore client = datastore.Client() key = client.key('Person') @@ -48,7 +48,7 @@

    Cloud Storage

    - from gcloud import storage + from google.cloud import storage client = storage.Client() bucket = client.get_bucket('') diff --git a/docs/json/json/master/toc.json b/docs/json/json/master/toc.json index c4ab0b2fa15a..2292459a133d 100644 --- a/docs/json/json/master/toc.json +++ b/docs/json/json/master/toc.json @@ -34,112 +34,112 @@ "nav": [ { "title": "Client", - "type": "gcloud/client/client" + "type": "google/cloud/client/client" }, { "title": "Connection", - "type": "gcloud/connection/connection" + "type": "google/cloud/connection/connection" }, { "title": "Credentials", - "type": "gcloud/credentials" + "type": "google/cloud/credentials" }, { "title": "Environment Variables", - "type": "gcloud/environment_vars" + "type": "google/cloud/environment_vars" }, { "title": "Iterator", - "type": "gcloud/iterator" + "type": "google/cloud/iterator" } ], "title": "gcloud", - "type": "gcloud/gcloud" + "type": "google/cloud/gcloud" }, { "implemented": ">=0.7.0", "nav": [ { "title": "Client", - "type": "gcloud/bigquery/client/client" + "type": "google/cloud/bigquery/client/client" }, { "title": "Dataset", - "type": "gcloud/bigquery/dataset/dataset" + "type": "google/cloud/bigquery/dataset/dataset" }, { "title": "Jobs", - "type": "gcloud/bigquery/job" + "type": "google/cloud/bigquery/job" }, { "title": "Table", - "type": "gcloud/bigquery/table/table" + "type": "google/cloud/bigquery/table/table" }, { "title": "Query", - "type": "gcloud/bigquery/query/query" + "type": "google/cloud/bigquery/query/query" } ], "title": "BigQuery", - "type": "gcloud/bigquery" + "type": "google/cloud/bigquery" }, { "implemented": ">=0.12.0", "nav": [ { "title": "Client", - "type": "gcloud/bigtable/client/client" + "type": "google/cloud/bigtable/client/client" }, { "title": "Cluster", - "type": "gcloud/bigtable/cluster/cluster" + "type": "google/cloud/bigtable/cluster/cluster" }, { "title": "Column Families", - "type": "gcloud/bigtable/column_family/columnfamily" + "type": "google/cloud/bigtable/column_family/columnfamily" }, { "title": "Bigtable Row", - "type": "gcloud/bigtable/row/row" + "type": "google/cloud/bigtable/row/row" }, { "title": "Bigtable Row Filter", - "type": "gcloud/bigtable/row_filters/rowfilter" + "type": "google/cloud/bigtable/row_filters/rowfilter" }, { "title": "Table", - "type": "gcloud/bigtable/table/table" + "type": "google/cloud/bigtable/table/table" } ], "title": "BigTable", - "type": "gcloud/bigtable" + "type": "google/cloud/bigtable" }, { "implemented": ">=0.3.0", "nav": [ { "title": "Client", - "type": "gcloud/datastore/client/client" + "type": "google/cloud/datastore/client/client" }, { "title": "Entity", - "type": "gcloud/datastore/entity/entity" + "type": "google/cloud/datastore/entity/entity" }, { "title": "Key", - "type": "gcloud/datastore/key/key" + "type": "google/cloud/datastore/key/key" }, { "title": "Query", - "type": "gcloud/datastore/query/query" + "type": "google/cloud/datastore/query/query" }, { "title": "Transaction", - "type": "gcloud/datastore/transaction/transaction" + "type": "google/cloud/datastore/transaction/transaction" }, { "title": "Batch", - "type": "gcloud/datastore/batch/batch" + "type": "google/cloud/datastore/batch/batch" }, { "title": "Helpers", @@ -147,305 +147,305 @@ } ], "title": "Datastore", - "type": "gcloud/datastore" + "type": "google/cloud/datastore" }, { "implemented": ">=0.8.0", "nav": [ { "title": "Client", - "type": "gcloud/dns/client/client" + "type": "google/cloud/dns/client/client" }, { "title": "Managed Zones", - "type": "gcloud/dns/zone/managedzone" + "type": "google/cloud/dns/zone/managedzone" }, { "title": "Resource Record Set", - "type": "gcloud/dns/resource_record_set/resourcerecordset" + "type": "google/cloud/dns/resource_record_set/resourcerecordset" }, { "title": "Change Sets", - "type": "gcloud/dns/changes/changes" + "type": "google/cloud/dns/changes/changes" } ], "title": "DNS", - "type": "gcloud/dns" + "type": "google/cloud/dns" }, { "nav": [ { "title": "Client", - "type": "gcloud/error_reporting/client/client" + "type": "google/cloud/error_reporting/client/client" } ], "title": "Error Reporting", - "type": "gcloud/error_reporting" + "type": "google/cloud/error_reporting" }, { "nav": [ { "title": "BadRequest", - "type": "gcloud/exceptions/badrequest" + "type": "google/cloud/exceptions/badrequest" }, { "title": "ClientError", - "type": "gcloud/exceptions/clienterror" + "type": "google/cloud/exceptions/clienterror" }, { "title": "Conflict", - "type": "gcloud/exceptions/conflict" + "type": "google/cloud/exceptions/conflict" }, { "title": "Forbidden", - "type": "gcloud/exceptions/forbidden" + "type": "google/cloud/exceptions/forbidden" }, { - "title": "GCloudError", - "type": "gcloud/exceptions/gclouderror" + "title": "GoogleCloudError", + "type": "google/cloud/exceptions/gclouderror" }, { "title": "InternalServerError", - "type": "gcloud/exceptions/internalservererror" + "type": "google/cloud/exceptions/internalservererror" }, { "title": "LengthRequired", - "type": "gcloud/exceptions/lengthrequired" + "type": "google/cloud/exceptions/lengthrequired" }, { "title": "MethodNotAllowed", - "type": "gcloud/exceptions/methodnotallowed" + "type": "google/cloud/exceptions/methodnotallowed" }, { "title": "MethodNotImplemented", - "type": "gcloud/exceptions/methodnotimplemented" + "type": "google/cloud/exceptions/methodnotimplemented" }, { "title": "MovedPermanently", - "type": "gcloud/exceptions/movedpermanently" + "type": "google/cloud/exceptions/movedpermanently" }, { "title": "NotFound", - "type": "gcloud/exceptions/notfound" + "type": "google/cloud/exceptions/notfound" }, { "title": "NotModified", - "type": "gcloud/exceptions/notmodified" + "type": "google/cloud/exceptions/notmodified" }, { "title": "PreconditionFailed", - "type": "gcloud/exceptions/preconditionfailed" + "type": "google/cloud/exceptions/preconditionfailed" }, { "title": "Redirection", - "type": "gcloud/exceptions/redirection" + "type": "google/cloud/exceptions/redirection" }, { "title": "RequestRangeNotSatisfiable", - "type": "gcloud/exceptions/requestrangenotsatisfiable" + "type": "google/cloud/exceptions/requestrangenotsatisfiable" }, { "title": "ResumeIncomplete", - "type": "gcloud/exceptions/resumeincomplete" + "type": "google/cloud/exceptions/resumeincomplete" }, { "title": "ServerError", - "type": "gcloud/exceptions/servererror" + "type": "google/cloud/exceptions/servererror" }, { "title": "ServiceUnavailable", - "type": "gcloud/exceptions/serviceunavailable" + "type": "google/cloud/exceptions/serviceunavailable" }, { "title": "TemporaryRedirect", - "type": "gcloud/exceptions/temporaryredirect" + "type": "google/cloud/exceptions/temporaryredirect" }, { "title": "TooManyRequests", - "type": "gcloud/exceptions/toomanyrequests" + "type": "google/cloud/exceptions/toomanyrequests" }, { "title": "Unauthorized", - "type": "gcloud/exceptions/unauthorized" + "type": "google/cloud/exceptions/unauthorized" }, { "title": "Exceptions", - "type": "gcloud/exceptions" + "type": "google/cloud/exceptions" } ], "title": "Exceptions", - "type": "gcloud/exceptions" + "type": "google/cloud/exceptions" }, { "implemented": ">=0.12.0", "nav": [ { "title": "Client", - "type": "gcloud/logging/client/client" + "type": "google/cloud/logging/client/client" }, { "title": "Logger", - "type": "gcloud/logging/logger/logger" + "type": "google/cloud/logging/logger/logger" }, { "title": "Entries", - "type": "gcloud/logging/entries" + "type": "google/cloud/logging/entries" }, { "title": "Metric", - "type": "gcloud/logging/metric/metric" + "type": "google/cloud/logging/metric/metric" }, { "title": "Sink", - "type": "gcloud/logging/sink/sink" + "type": "google/cloud/logging/sink/sink" } ], "title": "Cloud Logging", - "type": "gcloud/logging" + "type": "google/cloud/logging" }, { "implemented": ">=0.12.0", "nav": [ { "title": "Client", - "type": "gcloud/monitoring/client/client" + "type": "google/cloud/monitoring/client/client" }, { "title": "Metric Descriptors", - "type": "gcloud/monitoring/metric/metricdescriptor" + "type": "google/cloud/monitoring/metric/metricdescriptor" }, { "title": "Label Descriptors", - "type": "gcloud/monitoring/label/labeldescriptor" + "type": "google/cloud/monitoring/label/labeldescriptor" }, { "title": "Monitored Resource Descriptors", - "type": "gcloud/monitoring/resource/resourcedescriptor" + "type": "google/cloud/monitoring/resource/resourcedescriptor" }, { "title": "Time Series Query", - "type": "gcloud/monitoring/query/query" + "type": "google/cloud/monitoring/query/query" }, { "title": "Time Series", - "type": "gcloud/monitoring/timeseries/timeseries" + "type": "googe/cloud/monitoring/timeseries/timeseries" } ], "title": "Cloud Monitoring", - "type": "gcloud/monitoring" + "type": "google/cloud/monitoring" }, { "implemented": ">=0.5.0", "nav": [ { "title": "Client", - "type": "gcloud/pubsub/client/client" + "type": "google/cloud/pubsub/client/client" }, { "title": "Topic", - "type": "gcloud/pubsub/topic/topic" + "type": "google/cloud/pubsub/topic/topic" }, { "title": "Subscription", - "type": "gcloud/pubsub/subscription/subscription" + "type": "google/cloud/pubsub/subscription/subscription" }, { "title": "Message", - "type": "gcloud/pubsub/message/message" + "type": "google/cloud/pubsub/message/message" }, { "title": "Policy", - "type": "gcloud/pubsub/iam/policy" + "type": "google/cloud/pubsub/iam/policy" } ], "title": "Pub/Sub", - "type": "gcloud/pubsub" + "type": "google/cloud/pubsub" }, { "implemented": ">=0.8.0", "nav": [ { "title": "Client", - "type": "gcloud/resource_manager/client/client" + "type": "google/cloud/resource_manager/client/client" }, { "title": "Project", - "type": "gcloud/resource_manager/project/project" + "type": "google/cloud/resource_manager/project/project" } ], "title": "Resource Manager", - "type": "gcloud/resource_manager" + "type": "google/cloud/resource_manager" }, { "implemented": ">=0.3.0", "nav": [ { "title": "Client", - "type": "gcloud/storage/client/client" + "type": "google/cloud/storage/client/client" }, { "title": "Blob", - "type": "gcloud/storage/blob/blob" + "type": "google/cloud/storage/blob/blob" }, { "title": "Bucket", - "type": "gcloud/storage/bucket/bucket" + "type": "google/cloud/storage/bucket/bucket" }, { "title": "ACL", - "type": "gcloud/storage/acl/acl" + "type": "google/cloud/storage/acl/acl" }, { "title": "Batch", - "type": "gcloud/storage/batch/batch" + "type": "google/cloud/storage/batch/batch" } ], "title": "Storage", - "type": "gcloud/storage" + "type": "google/cloud/storage" }, { "nav": [ { "title": "Buffered Stream", - "type": "gcloud/streaming/buffered_stream/bufferedstream" + "type": "google/cloud/streaming/buffered_stream/bufferedstream" }, { "title": "Request", - "type": "gcloud/streaming/http_wrapper/request" + "type": "google/cloud/streaming/http_wrapper/request" }, { "title": "Response", - "type": "gcloud/streaming/http_wrapper/response" + "type": "google/cloud/streaming/http_wrapper/response" }, { "title": "Stream Slice", - "type": "gcloud/streaming/stream_slice/streamslice" + "type": "google/cloud/streaming/stream_slice/streamslice" }, { "title": "Download", - "type": "gcloud/streaming/transfer/download" + "type": "google/cloud/streaming/transfer/download" }, { "title": "Upload", - "type": "gcloud/streaming/transfer/upload" + "type": "google/cloud/streaming/transfer/upload" }, { "title": "Util", - "type": "gcloud/streaming/util" + "type": "google/cloud/streaming/util" } ], "title": "Streaming", - "type": "gcloud/streaming" + "type": "google/cloud/streaming" }, { "nav": [ { "title": "Connection", - "type": "gcloud/vision/connection/connection" + "type": "google/cloud/vision/connection/connection" } ], "title": "Vision", - "type": "gcloud/vision" + "type": "google/cloud/vision" } ] } diff --git a/docs/json/manifest.json b/docs/json/manifest.json index 91393f9baa32..fa41098a95a2 100644 --- a/docs/json/manifest.json +++ b/docs/json/manifest.json @@ -5,12 +5,12 @@ "lang": "python", "latestRelease": { "date": 1455306471454, - "link": "https://github.com/GoogleCloudPlatform/gcloud-python/tree/master", + "link": "https://github.com/GoogleCloudPlatform/google-cloud-python/tree/master", "name": "master" }, "markdown": "python", "package": { - "href": "https://pypi.python.org/pypi/gcloud", + "href": "https://pypi.python.org/pypi/google-cloud", "title": "PyPI" }, "titleDelimiter": ".", diff --git a/docs/language-client.rst b/docs/language-client.rst index 00f3e813727d..c0bc0b329ee0 100644 --- a/docs/language-client.rst +++ b/docs/language-client.rst @@ -1,13 +1,13 @@ Natural Language Client ======================= -.. automodule:: gcloud.language.client +.. automodule:: google.cloud.language.client :members: :show-inheritance: Connection ~~~~~~~~~~ -.. automodule:: gcloud.language.connection +.. automodule:: google.cloud.language.connection :members: :show-inheritance: diff --git a/docs/language-document.rst b/docs/language-document.rst index 17ebab4e1930..e879b11e590a 100644 --- a/docs/language-document.rst +++ b/docs/language-document.rst @@ -1,6 +1,6 @@ Document ~~~~~~~~ -.. automodule:: gcloud.language.document +.. automodule:: google.cloud.language.document :members: :show-inheritance: diff --git a/docs/language-responses.rst b/docs/language-responses.rst index 3bc86ec3cdac..0ad22fa9bb4f 100644 --- a/docs/language-responses.rst +++ b/docs/language-responses.rst @@ -4,20 +4,20 @@ Natural Language Response Classes Entity ~~~~~~ -.. automodule:: gcloud.language.entity +.. automodule:: google.cloud.language.entity :members: :show-inheritance: Sentiment ~~~~~~~~~ -.. automodule:: gcloud.language.sentiment +.. automodule:: google.cloud.language.sentiment :members: :show-inheritance: Syntax ~~~~~~ -.. automodule:: gcloud.language.syntax +.. automodule:: google.cloud.language.syntax :members: :show-inheritance: diff --git a/docs/language-usage.rst b/docs/language-usage.rst index dfaae7b87f16..9feea9c88de5 100644 --- a/docs/language-usage.rst +++ b/docs/language-usage.rst @@ -21,19 +21,19 @@ with your document storage on Google Cloud Storage. Client ------ -:class:`~gcloud.language.client.Client` objects provide a +: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. -For an overview of authentication in ``gcloud-python``, see +For an overview of authentication in ``google-cloud-python``, see :doc:`gcloud-auth`. Assuming your environment is set up as described in that document, -create an instance of :class:`~gcloud.language.client.Client`. +create an instance of :class:`~google.cloud.language.client.Client`. .. code-block:: python - >>> from gcloud import language + >>> from google.cloud import language >>> client = language.Client() By default the ``language`` is ``'en-US'`` and the ``encoding`` is @@ -45,9 +45,9 @@ UTF-8. To over-ride these values: ... encoding=language.Encoding.UTF16) The encoding can be one of -:attr:`Encoding.UTF8 `, -:attr:`Encoding.UTF16 `, or -:attr:`Encoding.UTF32 `. +:attr:`Encoding.UTF8 `, +:attr:`Encoding.UTF16 `, or +:attr:`Encoding.UTF32 `. Methods ------- @@ -59,7 +59,7 @@ The Google Natural Language API has three supported methods - `annotateText`_ and each method uses a `Document`_ for representing text. To -create a :class:`~gcloud.language.document.Document`, +create a :class:`~google.cloud.language.document.Document`, .. code-block:: python @@ -70,7 +70,7 @@ create a :class:`~gcloud.language.document.Document`, ... 'their new Android phones.') >>> document = client.document_from_text(text_content) -By using :meth:`~gcloud.language.client.Client.document_from_text`, +By using :meth:`~google.cloud.language.client.Client.document_from_text`, the document's type is plain text: .. code-block:: python @@ -89,7 +89,7 @@ the client True In addition, the -:meth:`~gcloud.language.client.Client.document_from_html`, +: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: @@ -117,12 +117,12 @@ However, the ``analyzeSentiment`` method `only supports`_ English text. .. _only supports: https://cloud.google.com/natural-language/reference/rest/v1beta1/documents/analyzeSentiment#body.request_body.FIELDS.document The document type (``doc_type``) value can be one of -:attr:`Document.PLAIN_TEXT ` or -:attr:`Document.HTML `. +:attr:`Document.PLAIN_TEXT ` or +:attr:`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:`~gcloud.language.client.Client.document_from_url` method: +:meth:`~google.cloud.language.client.Client.document_from_url` method: .. code-block:: python @@ -150,9 +150,9 @@ The document type can be specified with the ``doc_type`` argument: Analyze Entities ---------------- -The :meth:`~gcloud.language.document.Document.analyze_entities` method +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:`~gcloud.language.entity.Entity` objects. +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. @@ -191,9 +191,9 @@ metadata and other properties. Analyze Sentiment ----------------- -The :meth:`~gcloud.language.document.Document.analyze_sentiment` method +The :meth:`~google.cloud.language.document.Document.analyze_sentiment` method analyzes the sentiment of the provided text and returns a -:class:`~gcloud.language.sentiment.Sentiment`. Currently, this method +:class:`~google.cloud.language.sentiment.Sentiment`. Currently, this method only supports English text. .. code-block:: python @@ -209,23 +209,23 @@ only supports English text. Annotate Text ------------- -The :meth:`~gcloud.language.document.Document.annotate_text` method +The :meth:`~google.cloud.language.document.Document.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:`~gcloud.language.syntax.Token` +* ``tokens``: A :class:`list` of :class:`~google.cloud.language.syntax.Token` object (e.g. words, punctuation) -* ``sentiment``: The :class:`~gcloud.language.sentiment.Sentiment` of +* ``sentiment``: The :class:`~google.cloud.language.sentiment.Sentiment` of the text (as returned by - :meth:`~gcloud.language.document.Document.analyze_sentiment`) -* ``entities``: :class:`list` of :class:`~gcloud.language.entity.Entity` + :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:`~gcloud.language.document.Document.analyze_entities`) + :meth:`~google.cloud.language.document.Document.analyze_entities`) -By default :meth:`~gcloud.language.document.Document.annotate_text` has +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 diff --git a/docs/logging-client.rst b/docs/logging-client.rst index fb5f009947cd..cc834d1c21af 100644 --- a/docs/logging-client.rst +++ b/docs/logging-client.rst @@ -1,13 +1,13 @@ Stackdriver Logging Client ========================== -.. automodule:: gcloud.logging.client +.. automodule:: google.cloud.logging.client :members: :show-inheritance: Connection ~~~~~~~~~~ -.. automodule:: gcloud.logging.connection +.. automodule:: google.cloud.logging.connection :members: :show-inheritance: diff --git a/docs/logging-entries.rst b/docs/logging-entries.rst index a22f6094d927..762b7776ee2c 100644 --- a/docs/logging-entries.rst +++ b/docs/logging-entries.rst @@ -1,7 +1,7 @@ Entries ======= -.. automodule:: gcloud.logging.entries +.. automodule:: google.cloud.logging.entries :members: :show-inheritance: diff --git a/docs/logging-handlers.rst b/docs/logging-handlers.rst index c612d0f1129b..1a258a88a541 100644 --- a/docs/logging-handlers.rst +++ b/docs/logging-handlers.rst @@ -1,6 +1,6 @@ Python Logging Module Handler ============================== -.. automodule:: gcloud.logging.handlers.handlers +.. automodule:: google.cloud.logging.handlers.handlers :members: :show-inheritance: diff --git a/docs/logging-logger.rst b/docs/logging-logger.rst index 4a95d01662a7..5e167671b7bd 100644 --- a/docs/logging-logger.rst +++ b/docs/logging-logger.rst @@ -1,7 +1,7 @@ Logger ====== -.. automodule:: gcloud.logging.logger +.. automodule:: google.cloud.logging.logger :members: :show-inheritance: diff --git a/docs/logging-metric.rst b/docs/logging-metric.rst index 2c49a94049ce..ca30e3c89eca 100644 --- a/docs/logging-metric.rst +++ b/docs/logging-metric.rst @@ -1,6 +1,6 @@ Metrics ======= -.. automodule:: gcloud.logging.metric +.. automodule:: google.cloud.logging.metric :members: :show-inheritance: diff --git a/docs/logging-sink.rst b/docs/logging-sink.rst index 4e2dd40d44dc..35e88562bbee 100644 --- a/docs/logging-sink.rst +++ b/docs/logging-sink.rst @@ -1,6 +1,6 @@ Sinks ===== -.. automodule:: gcloud.logging.sink +.. automodule:: google.cloud.logging.sink :members: :show-inheritance: diff --git a/docs/logging-transports-base.rst b/docs/logging-transports-base.rst index b01b55f1b732..5b52c46cadcb 100644 --- a/docs/logging-transports-base.rst +++ b/docs/logging-transports-base.rst @@ -1,6 +1,6 @@ Python Logging Handler Sync Transport ====================================== -.. automodule:: gcloud.logging.handlers.transports.base +.. automodule:: google.cloud.logging.handlers.transports.base :members: :show-inheritance: diff --git a/docs/logging-transports-sync.rst b/docs/logging-transports-sync.rst index 88f2cf172c19..edb2b72f578d 100644 --- a/docs/logging-transports-sync.rst +++ b/docs/logging-transports-sync.rst @@ -1,6 +1,6 @@ Python Logging Handler Sync Transport ====================================== -.. automodule:: gcloud.logging.handlers.transports.sync +.. automodule:: google.cloud.logging.handlers.transports.sync :members: :show-inheritance: diff --git a/docs/logging-transports-thread.rst b/docs/logging-transports-thread.rst index 97f41730a3a2..45780b27fe42 100644 --- a/docs/logging-transports-thread.rst +++ b/docs/logging-transports-thread.rst @@ -2,6 +2,6 @@ Python Logging Handler Threaded Transport ========================================= -.. automodule:: gcloud.logging.handlers.transports.background_thread +.. automodule:: google.cloud.logging.handlers.transports.background_thread :members: :show-inheritance: diff --git a/docs/logging-usage.rst b/docs/logging-usage.rst index 1100227a078b..7acf6d643ab8 100644 --- a/docs/logging-usage.rst +++ b/docs/logging-usage.rst @@ -5,33 +5,33 @@ Using the API Authentication and Configuration -------------------------------- -- For an overview of authentication in ``gcloud-python``, +- For an overview of authentication in ``google-cloud-python``, see :doc:`gcloud-auth`. - In addition to any authentication configuration, you should also set the - :envvar:`GCLOUD_PROJECT` environment variable for the project you'd like + :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd like to interact with. If you are Google App Engine or Google Compute Engine this will be detected automatically. - The library now enables the ``gRPC`` transport for the logging API by default, assuming that the required dependencies are installed and importable. To *disable* this transport, set the - :envvar:`GCLOUD_DISABLE_GAX` environment variable to a non-empty string, - e.g.: ``$ export GCLOUD_DISABLE_GAX=1``. + :envvar:`GOOGLE_CLOUD_DISABLE_GAX` environment variable to a non-empty string, + e.g.: ``$ export GOOGLE_CLOUD_DISABLE_GAX=1``. - After configuring your environment, create a - :class:`Client ` + :class:`Client ` .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() or pass in ``credentials`` and ``project`` explicitly .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client(project='my-project', credentials=creds) @@ -42,7 +42,7 @@ Write a simple text entry to a logger. .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> logger = client.logger('log_name') >>> logger.log_text("A simple entry") # API call @@ -51,7 +51,7 @@ Write a dictionary entry to a logger. .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> logger = client.logger('log_name') >>> logger.log_struct( @@ -66,7 +66,7 @@ Fetch entries for the default project. .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> entries, token = client.list_entries() # API call >>> for entry in entries: @@ -80,7 +80,7 @@ Fetch entries across multiple projects. .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> entries, token = client.list_entries( ... project_ids=['one-project', 'another-project']) # API call @@ -91,7 +91,7 @@ Filter entries retrieved using the `Advanced Logs Filters`_ syntax .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> FILTER = "log:log_name AND textPayload:simple" >>> entries, token = client.list_entries(filter=FILTER) # API call @@ -100,7 +100,7 @@ Sort entries in descending timestamp order. .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> entries, token = client.list_entries(order_by=logging.DESCENDING) # API call @@ -108,7 +108,7 @@ Retrieve entries in batches of 10, iterating until done. .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> retrieved = [] >>> token = None @@ -122,7 +122,7 @@ Retrieve entries for a single logger, sorting in descending timestamp order: .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> logger = client.logger('log_name') >>> entries, token = logger.list_entries(order_by=logging.DESCENDING) # API call @@ -132,7 +132,7 @@ Delete all entries for a logger .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> logger = client.logger('log_name') >>> logger.delete() # API call @@ -148,7 +148,7 @@ Create a metric: .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> metric = client.metric( ... "robots", "Robots all up in your server", @@ -163,7 +163,7 @@ List all metrics for a project: .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> metrics, token = client.list_metrics() >>> len(metrics) @@ -176,7 +176,7 @@ Refresh local information about a metric: .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> metric = client.metric("robots") >>> metric.reload() # API call @@ -189,7 +189,7 @@ Update a metric: .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> metric = client.metric("robots") >>> metric.exists() # API call @@ -202,7 +202,7 @@ Delete a metric: .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> metric = client.metric("robots") >>> metric.exists() # API call @@ -227,7 +227,7 @@ Add ``cloud-logs@google.com`` as the owner of ``my-bucket-name``: .. doctest:: - >>> from gcloud import storage + >>> from google.cloud import storage >>> client = storage.Client() >>> bucket = client.get_bucket('my-bucket-name') >>> bucket.acl.reload() @@ -248,8 +248,8 @@ See: `Setting permissions for BigQuery`_ .. doctest:: - >>> from gcloud import bigquery - >>> from gcloud.bigquery.dataset import AccessGrant + >>> from google.cloud import bigquery + >>> from google.cloud.bigquery.dataset import AccessGrant >>> bigquery_client = bigquery.Client() >>> dataset = bigquery_client.dataset('my-dataset-name') >>> dataset.create() @@ -272,7 +272,7 @@ See: `Setting permissions for Pub/Sub`_ .. doctest:: - >>> from gcloud import pubsub + >>> from google.cloud import pubsub >>> client = pubsub.Client() >>> topic = client.topic('your-topic-name') >>> policy = top.get_iam_policy() @@ -285,7 +285,7 @@ Create a Cloud Storage sink: .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> sink = client.sink( ... "robots-storage", @@ -301,7 +301,7 @@ Create a BigQuery sink: .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> sink = client.sink( ... "robots-bq", @@ -317,7 +317,7 @@ Create a Cloud Pub/Sub sink: .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> sink = client.sink( @@ -334,7 +334,7 @@ List all sinks for a project: .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> sinks, token = client.list_sinks() >>> for sink in sinks: @@ -347,7 +347,7 @@ Refresh local information about a sink: .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> sink = client.sink('robots-storage') >>> sink.filter is None @@ -362,7 +362,7 @@ Update a sink: .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> sink = client.sink("robots") >>> sink.reload() # API call @@ -373,7 +373,7 @@ Delete a sink: .. doctest:: - >>> from gcloud import logging + >>> from google.cloud import logging >>> client = logging.Client() >>> sink = client.sink( ... "robots", @@ -389,15 +389,15 @@ Integration with Python logging module It's possible to tie the Python :mod:`logging` module directly into Google Cloud Logging. To use it, -create a :class:`CloudLoggingHandler ` instance from your +create a :class:`CloudLoggingHandler ` instance from your Logging client. .. doctest:: >>> import logging - >>> import gcloud.logging # Don't conflict with standard logging - >>> from gcloud.logging.handlers import CloudLoggingHandler - >>> client = gcloud.logging.Client() + >>> import google.cloud.logging # Don't conflict with standard logging + >>> from google.cloud.logging.handlers import CloudLoggingHandler + >>> client = google.cloud.logging.Client() >>> handler = CloudLoggingHandler(client) >>> cloud_logger = logging.getLogger('cloudLogger') >>> cloud_logger.setLevel(logging.INFO) # defaults to WARN @@ -421,15 +421,15 @@ change it by providing a name to the handler: 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 Cloud Logging, as well as any other loggers created. However, you must avoid infinite recursion from the logging calls the client itself makes. A helper -method :meth:`setup_logging ` is provided to configure +method :meth:`setup_logging ` is provided to configure this automatically: .. doctest:: >>> import logging - >>> import gcloud.logging # Don't conflict with standard logging - >>> from gcloud.logging.handlers import CloudLoggingHandler, setup_logging - >>> client = gcloud.logging.Client() + >>> import google.cloud.logging # Don't conflict with standard logging + >>> from google.cloud.logging.handlers import CloudLoggingHandler, setup_logging + >>> client = google.cloud.logging.Client() >>> handler = CloudLoggingHandler(client) >>> logging.getLogger().setLevel(logging.INFO) # defaults to WARN >>> setup_logging(handler) @@ -447,10 +447,10 @@ Python logging handler transports ================================== The Python logging handler can use different transports. The default is -:class:`gcloud.logging.handlers.BackgroundThreadTransport`. +:class:`google.cloud.logging.handlers.BackgroundThreadTransport`. - 1. :class:`gcloud.logging.handlers.BackgroundThreadTransport` this is the default. It writes + 1. :class:`google.cloud.logging.handlers.BackgroundThreadTransport` this is the default. It writes entries on a background :class:`python.threading.Thread`. - 1. :class:`gcloud.logging.handlers.SyncTransport` this handler does a direct API call on each + 1. :class:`google.cloud.logging.handlers.SyncTransport` this handler does a direct API call on each logging statement to write the entry. diff --git a/docs/monitoring-client.rst b/docs/monitoring-client.rst index baea7d2fd592..1aec72367379 100644 --- a/docs/monitoring-client.rst +++ b/docs/monitoring-client.rst @@ -1,13 +1,13 @@ Stackdriver Monitoring Client ============================= -.. automodule:: gcloud.monitoring.client +.. automodule:: google.cloud.monitoring.client :members: :show-inheritance: Connection ~~~~~~~~~~ -.. automodule:: gcloud.monitoring.connection +.. automodule:: google.cloud.monitoring.connection :members: :show-inheritance: diff --git a/docs/monitoring-group.rst b/docs/monitoring-group.rst index 0187dad0099f..db7d3acb02ed 100644 --- a/docs/monitoring-group.rst +++ b/docs/monitoring-group.rst @@ -1,7 +1,7 @@ Groups ====== -.. automodule:: gcloud.monitoring.group +.. automodule:: google.cloud.monitoring.group :members: :show-inheritance: diff --git a/docs/monitoring-label.rst b/docs/monitoring-label.rst index a20d5a741af0..67b7c16b7689 100644 --- a/docs/monitoring-label.rst +++ b/docs/monitoring-label.rst @@ -1,6 +1,6 @@ Label Descriptors ================= -.. automodule:: gcloud.monitoring.label +.. automodule:: google.cloud.monitoring.label :members: :show-inheritance: diff --git a/docs/monitoring-metric.rst b/docs/monitoring-metric.rst index e1fb979e3d22..abb6395f864c 100644 --- a/docs/monitoring-metric.rst +++ b/docs/monitoring-metric.rst @@ -1,6 +1,6 @@ Metric Descriptors ================== -.. automodule:: gcloud.monitoring.metric +.. automodule:: google.cloud.monitoring.metric :members: :show-inheritance: diff --git a/docs/monitoring-query.rst b/docs/monitoring-query.rst index 1da7f7e61fcc..28cc2def2522 100644 --- a/docs/monitoring-query.rst +++ b/docs/monitoring-query.rst @@ -1,6 +1,6 @@ Time Series Query ================= -.. automodule:: gcloud.monitoring.query +.. automodule:: google.cloud.monitoring.query :members: :show-inheritance: diff --git a/docs/monitoring-resource.rst b/docs/monitoring-resource.rst index d9750decd1c6..b7faf93e68df 100644 --- a/docs/monitoring-resource.rst +++ b/docs/monitoring-resource.rst @@ -1,6 +1,6 @@ Monitored Resource Descriptors ============================== -.. automodule:: gcloud.monitoring.resource +.. automodule:: google.cloud.monitoring.resource :members: :show-inheritance: diff --git a/docs/monitoring-timeseries.rst b/docs/monitoring-timeseries.rst index 2d3133e7823a..e580f8067d69 100644 --- a/docs/monitoring-timeseries.rst +++ b/docs/monitoring-timeseries.rst @@ -1,6 +1,6 @@ Time Series =========== -.. automodule:: gcloud.monitoring.timeseries +.. automodule:: google.cloud.monitoring.timeseries :members: :show-inheritance: diff --git a/docs/monitoring-usage.rst b/docs/monitoring-usage.rst index 93979009e7d0..af217c6271f2 100644 --- a/docs/monitoring-usage.rst +++ b/docs/monitoring-usage.rst @@ -40,8 +40,8 @@ The Stackdriver Monitoring Client Object The Stackdriver Monitoring client library generally makes its functionality available as methods of the monitoring -:class:`~gcloud.monitoring.client.Client` class. -A :class:`~gcloud.monitoring.client.Client` instance holds +:class:`~google.cloud.monitoring.client.Client` class. +A :class:`~google.cloud.monitoring.client.Client` instance holds authentication credentials and the ID of the target project with which the metric data of interest is associated. This project ID will often refer to a `Stackdriver account`_ binding multiple @@ -54,12 +54,12 @@ more information. It is thus typical to create a client object as follows:: - >>> from gcloud import monitoring + >>> from google.cloud import monitoring >>> client = monitoring.Client(project='target-project') If you are running in Google Compute Engine or Google App Engine, the current project is the default target project. This default -can be further overridden with the :envvar:`GCLOUD_PROJECT` +can be further overridden with the :envvar:`GOOGLE_CLOUD_PROJECT` environment variable. Using the default target project is even easier:: @@ -77,14 +77,14 @@ Monitored Resource Descriptors The available monitored resource types are defined by *monitored resource descriptors*. You can fetch a list of these with the -:meth:`~gcloud.monitoring.client.Client.list_resource_descriptors` method:: +:meth:`~google.cloud.monitoring.client.Client.list_resource_descriptors` method:: >>> for descriptor in client.list_resource_descriptors(): ... print(descriptor.type) -Each :class:`~gcloud.monitoring.resource.ResourceDescriptor` +Each :class:`~google.cloud.monitoring.resource.ResourceDescriptor` has a type, a display name, a description, and a list of -:class:`~gcloud.monitoring.label.LabelDescriptor` instances. +:class:`~google.cloud.monitoring.label.LabelDescriptor` instances. See the documentation about `Monitored Resources`_ for more information. @@ -98,22 +98,22 @@ Metric Descriptors The available metric types are defined by *metric descriptors*. They include `platform metrics`_, `agent metrics`_, and `custom metrics`_. You can list all of these with the -:meth:`~gcloud.monitoring.client.Client.list_metric_descriptors` method:: +:meth:`~google.cloud.monitoring.client.Client.list_metric_descriptors` method:: >>> for descriptor in client.list_metric_descriptors(): ... print(descriptor.type) -See :class:`~gcloud.monitoring.metric.MetricDescriptor` and the +See :class:`~google.cloud.monitoring.metric.MetricDescriptor` and the `Metric Descriptors`_ API documentation for more information. You can create new metric descriptors to define custom metrics in the ``custom.googleapis.com`` namespace. You do this by creating a -:class:`~gcloud.monitoring.metric.MetricDescriptor` object using the -client's :meth:`~gcloud.monitoring.client.Client.metric_descriptor` +:class:`~google.cloud.monitoring.metric.MetricDescriptor` object using the +client's :meth:`~google.cloud.monitoring.client.Client.metric_descriptor` factory and then calling the object's -:meth:`~gcloud.monitoring.metric.MetricDescriptor.create` method:: +:meth:`~google.cloud.monitoring.metric.MetricDescriptor.create` method:: - >>> from gcloud.monitoring import MetricKind, ValueType + >>> from google.cloud.monitoring import MetricKind, ValueType >>> descriptor = client.metric_descriptor( ... 'custom.googleapis.com/my_metric', ... metric_kind=MetricKind.GAUGE, @@ -129,13 +129,13 @@ You can delete such a metric descriptor as follows:: To define a custom metric parameterized by one or more labels, you must build the appropriate -:class:`~gcloud.monitoring.label.LabelDescriptor` objects +:class:`~google.cloud.monitoring.label.LabelDescriptor` objects and include them in the -:class:`~gcloud.monitoring.metric.MetricDescriptor` object +:class:`~google.cloud.monitoring.metric.MetricDescriptor` object before you call -:meth:`~gcloud.monitoring.metric.MetricDescriptor.create`:: +:meth:`~google.cloud.monitoring.metric.MetricDescriptor.create`:: - >>> from gcloud.monitoring import LabelDescriptor, LabelValueType + >>> from google.cloud.monitoring import LabelDescriptor, LabelValueType >>> label = LabelDescriptor('response_code', LabelValueType.INT64, ... description='HTTP status code') >>> descriptor = client.metric_descriptor( @@ -160,7 +160,7 @@ Groups A group is a dynamic collection of *monitored resources* whose membership is defined by a `filter`_. These groups are usually created via the `Stackdriver dashboard`_. You can list all the groups in a project with the -:meth:`~gcloud.monitoring.client.Client.list_groups` method:: +:meth:`~google.cloud.monitoring.client.Client.list_groups` method:: >>> for group in client.list_groups(): ... print(group.id, group.display_name, group.parent_id) @@ -168,7 +168,7 @@ defined by a `filter`_. These groups are usually created via the ('a002', 'Front-end', 'a001') ('1003', 'Back-end', 'a001') -See :class:`~gcloud.monitoring.group.Group` and the API documentation for +See :class:`~google.cloud.monitoring.group.Group` and the API documentation for `Groups`_ and `Group members`_ for more information. You can get a specific group based on it's ID as follows:: @@ -176,7 +176,7 @@ You can get a specific group based on it's ID as follows:: >>> group = client.fetch_group('a001') You can get the current members of this group using the -:meth:`~gcloud.monitoring.group.Group.list_members` method:: +:meth:`~google.cloud.monitoring.group.Group.list_members` method:: >>> for member in group.list_members(): ... print(member) @@ -187,9 +187,9 @@ membership changes over time, as *monitored resources* come and go, and as they change properties. You can create new groups to define new collections of *monitored resources*. -You do this by creating a :class:`~gcloud.monitoring.group.Group` object using -the client's :meth:`~gcloud.monitoring.client.Client.group` factory and then -calling the object's :meth:`~gcloud.monitoring.group.Group.create` method:: +You do this by creating a :class:`~google.cloud.monitoring.group.Group` object using +the client's :meth:`~google.cloud.monitoring.client.Client.group` factory and then +calling the object's :meth:`~google.cloud.monitoring.group.Group.create` method:: >>> filter_string = 'resource.zone = "us-central1-a"' >>> group = client.group( @@ -239,15 +239,15 @@ Time Series Queries A time series includes a collection of data points and a set of resource and metric label values. -See :class:`~gcloud.monitoring.timeseries.TimeSeries` and the +See :class:`~google.cloud.monitoring.timeseries.TimeSeries` and the `Time Series`_ API documentation for more information. While you can obtain time series objects by iterating over a -:class:`~gcloud.monitoring.query.Query` object, usually it is +:class:`~google.cloud.monitoring.query.Query` object, usually it is more useful to retrieve time series data in the form of a :class:`pandas.DataFrame`, where each column corresponds to a single time series. For this, you must have :mod:`pandas` installed; -it is not a required dependency of ``gcloud-python``. +it is not a required dependency of ``google-cloud-python``. You can display CPU utilization across your GCE instances during the last five minutes as follows:: @@ -256,11 +256,11 @@ the last five minutes as follows:: >>> query = client.query(METRIC, minutes=5) >>> print(query.as_dataframe()) -:class:`~gcloud.monitoring.query.Query` objects provide a variety of +:class:`~google.cloud.monitoring.query.Query` objects provide a variety of methods for refining the query. You can request temporal alignment and cross-series reduction, and you can filter by label values. -See the client :meth:`~gcloud.monitoring.client.Client.query` method -and the :class:`~gcloud.monitoring.query.Query` class for more +See the client :meth:`~google.cloud.monitoring.client.Client.query` method +and the :class:`~google.cloud.monitoring.query.Query` class for more information. For example, you can display CPU utilization during the last hour @@ -268,7 +268,7 @@ across GCE instances with names beginning with ``"mycluster-"``, averaged over five-minute intervals and aggregated per zone, as follows:: - >>> from gcloud.monitoring import Aligner, Reducer + >>> from google.cloud.monitoring import Aligner, Reducer >>> METRIC = 'compute.googleapis.com/instance/cpu/utilization' >>> query = (client.query(METRIC, hours=1) ... .select_metrics(instance_name_prefix='mycluster-') diff --git a/docs/operation-api.rst b/docs/operation-api.rst index 5a09a8042c77..489a2683920c 100644 --- a/docs/operation-api.rst +++ b/docs/operation-api.rst @@ -1,7 +1,7 @@ Long-Running Operations ~~~~~~~~~~~~~~~~~~~~~~~ -.. automodule:: gcloud.operation +.. automodule:: google.cloud.operation :members: :show-inheritance: diff --git a/docs/pubsub-client.rst b/docs/pubsub-client.rst index 858d2b7332b7..c5e70e6ae683 100644 --- a/docs/pubsub-client.rst +++ b/docs/pubsub-client.rst @@ -1,13 +1,13 @@ Pub/Sub Client ============== -.. automodule:: gcloud.pubsub.client +.. automodule:: google.cloud.pubsub.client :members: :show-inheritance: Connection ~~~~~~~~~~ -.. automodule:: gcloud.pubsub.connection +.. automodule:: google.cloud.pubsub.connection :members: :show-inheritance: diff --git a/docs/pubsub-iam.rst b/docs/pubsub-iam.rst index 6cdfaf266cf5..a939f4d3a8c8 100644 --- a/docs/pubsub-iam.rst +++ b/docs/pubsub-iam.rst @@ -1,7 +1,7 @@ IAM Policy ~~~~~~~~~~ -.. automodule:: gcloud.pubsub.iam +.. automodule:: google.cloud.pubsub.iam :members: :member-order: bysource :show-inheritance: diff --git a/docs/pubsub-message.rst b/docs/pubsub-message.rst index 3b2561f87b9f..654c607d46b3 100644 --- a/docs/pubsub-message.rst +++ b/docs/pubsub-message.rst @@ -1,6 +1,6 @@ Message ~~~~~~~ -.. automodule:: gcloud.pubsub.message +.. automodule:: google.cloud.pubsub.message :members: :show-inheritance: diff --git a/docs/pubsub-subscription.rst b/docs/pubsub-subscription.rst index d92d43e57ad4..f242cb644e83 100644 --- a/docs/pubsub-subscription.rst +++ b/docs/pubsub-subscription.rst @@ -1,7 +1,7 @@ Subscriptions ~~~~~~~~~~~~~ -.. automodule:: gcloud.pubsub.subscription +.. automodule:: google.cloud.pubsub.subscription :members: :member-order: bysource :show-inheritance: diff --git a/docs/pubsub-topic.rst b/docs/pubsub-topic.rst index e2ddc3c04570..323d467a08ce 100644 --- a/docs/pubsub-topic.rst +++ b/docs/pubsub-topic.rst @@ -1,7 +1,7 @@ Topics ~~~~~~ -.. automodule:: gcloud.pubsub.topic +.. automodule:: google.cloud.pubsub.topic :members: :member-order: bysource :show-inheritance: diff --git a/docs/pubsub-usage.rst b/docs/pubsub-usage.rst index b530fc37672d..00cedfb122ae 100644 --- a/docs/pubsub-usage.rst +++ b/docs/pubsub-usage.rst @@ -4,35 +4,35 @@ Using the API Authentication / Configuration ------------------------------ -- Use :class:`Client ` objects to configure +- Use :class:`Client ` objects to configure your applications. - In addition to any authentication configuration, you should also set the - :envvar:`GCLOUD_PROJECT` environment variable for the project you'd like + :envvar:`GOOGLE_CLOUD_PROJECT` environment variable for the project you'd like to interact with. If you are Google App Engine or Google Compute Engine this will be detected automatically. - The library now enables the ``gRPC`` transport for the pubsub API by default, assuming that the required dependencies are installed and importable. To *disable* this transport, set the - :envvar:`GCLOUD_DISABLE_GAX` environment variable to a non-empty string, - e.g.: ``$ export GCLOUD_DISABLE_GAX=1``. + :envvar:`GOOGLE_CLOUD_DISABLE_GAX` environment variable to a non-empty string, + e.g.: ``$ export GOOGLE_CLOUD_DISABLE_GAX=1``. -- :class:`Client ` objects hold both a ``project`` +- :class:`Client ` objects hold both a ``project`` and an authenticated connection to the PubSub service. - The authentication credentials can be implicitly determined from the environment or directly via - :meth:`from_service_account_json ` + :meth:`from_service_account_json ` and - :meth:`from_service_account_p12 `. + :meth:`from_service_account_p12 `. -- After setting ``GOOGLE_APPLICATION_CREDENTIALS`` and ``GCLOUD_PROJECT`` - environment variables, create a :class:`Client ` +- After setting ``GOOGLE_APPLICATION_CREDENTIALS`` and ``GOOGLE_CLOUD_PROJECT`` + environment variables, create a :class:`Client ` .. doctest:: - >>> from gcloud import pubsub + >>> from google.cloud import pubsub >>> client = pubsub.Client() diff --git a/docs/pubsub_snippets.py b/docs/pubsub_snippets.py index f1656e8d17c6..82559ff9c2a1 100644 --- a/docs/pubsub_snippets.py +++ b/docs/pubsub_snippets.py @@ -15,8 +15,8 @@ """Testable usage examples for Google Cloud Pubsub API wrapper Each example function takes a ``client`` argument (which must be an instance -of :class:`gcloud.pubsub.client.Client`) and uses it to perform a task with -the API. +of :class:`google.cloud.pubsub.client.Client`) and uses it to perform a task +with the API. To facilitate running the examples as system tests, each example is also passed a ``to_delete`` list; the function adds to the list any objects created which @@ -25,7 +25,7 @@ import time -from gcloud.pubsub.client import Client +from google.cloud.pubsub.client import Client def snippet(func): @@ -154,7 +154,7 @@ def topic_check_iam_permissions(client, to_delete): to_delete.append(topic) # [START topic_check_iam_permissions] - from gcloud.pubsub.iam import OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE + from google.cloud.pubsub.iam import OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE TO_CHECK = [OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE] ALLOWED = topic.check_iam_permissions(TO_CHECK) assert set(ALLOWED) == set(TO_CHECK) @@ -376,7 +376,7 @@ def do_something_with(message): # pylint: disable=unused-argument extras.append(message.attributes) # [START subscription_pull_autoack] - from gcloud.pubsub.subscription import AutoAck + from google.cloud.pubsub.subscription import AutoAck with AutoAck(subscription, max_messages=10) as ack: for ack_id, message in list(ack.items()): try: @@ -436,7 +436,7 @@ def subscription_check_iam_permissions(client, to_delete): to_delete.append(subscription) # [START subscription_check_iam_permissions] - from gcloud.pubsub.iam import OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE + from google.cloud.pubsub.iam import OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE TO_CHECK = [OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE] ALLOWED = subscription.check_iam_permissions(TO_CHECK) assert set(ALLOWED) == set(TO_CHECK) diff --git a/docs/resource-manager-api.rst b/docs/resource-manager-api.rst index 6caf53e93b1d..87fab63c27f2 100644 --- a/docs/resource-manager-api.rst +++ b/docs/resource-manager-api.rst @@ -20,7 +20,7 @@ Here's a quick example of the full life-cycle: .. code-block:: python - >>> from gcloud import resource_manager + >>> from google.cloud import resource_manager >>> client = resource_manager.Client() >>> # List all projects you have access to @@ -69,7 +69,7 @@ provided by the `Google Cloud SDK`_, which you can get by running .. _Google Cloud SDK: http://cloud.google.com/sdk -Once you run that command, ``gcloud-python`` will automatically pick up the +Once you run that command, ``google-cloud-python`` will automatically pick up the credentials, and you can use the "automatic discovery" feature of the library. Start by authenticating: @@ -82,5 +82,5 @@ And then simply create a client: .. code-block:: python - >>> from gcloud import resource_manager + >>> from google.cloud import resource_manager >>> client = resource_manager.Client() diff --git a/docs/resource-manager-client.rst b/docs/resource-manager-client.rst index 4c354b25bec5..0eb5837f2623 100644 --- a/docs/resource-manager-client.rst +++ b/docs/resource-manager-client.rst @@ -5,13 +5,13 @@ Client ------ -.. automodule:: gcloud.resource_manager.client +.. automodule:: google.cloud.resource_manager.client :members: :show-inheritance: Connection ~~~~~~~~~~ -.. automodule:: gcloud.resource_manager.connection +.. automodule:: google.cloud.resource_manager.connection :members: :show-inheritance: diff --git a/docs/resource-manager-project.rst b/docs/resource-manager-project.rst index eee478c2533f..e6f8a90be298 100644 --- a/docs/resource-manager-project.rst +++ b/docs/resource-manager-project.rst @@ -1,6 +1,6 @@ Projects ~~~~~~~~ -.. automodule:: gcloud.resource_manager.project +.. automodule:: google.cloud.resource_manager.project :members: :show-inheritance: diff --git a/docs/storage-acl.rst b/docs/storage-acl.rst index 6c2e60b55042..f1f7d028907d 100644 --- a/docs/storage-acl.rst +++ b/docs/storage-acl.rst @@ -1,6 +1,6 @@ ACL ~~~ -.. automodule:: gcloud.storage.acl +.. automodule:: google.cloud.storage.acl :members: :show-inheritance: diff --git a/docs/storage-batch.rst b/docs/storage-batch.rst index 15d96186975c..992dd9349157 100644 --- a/docs/storage-batch.rst +++ b/docs/storage-batch.rst @@ -1,6 +1,6 @@ Batches ~~~~~~~ -.. automodule:: gcloud.storage.batch +.. automodule:: google.cloud.storage.batch :members: :show-inheritance: diff --git a/docs/storage-blobs.rst b/docs/storage-blobs.rst index e6a157771a1d..18fb773629d6 100644 --- a/docs/storage-blobs.rst +++ b/docs/storage-blobs.rst @@ -1,6 +1,6 @@ Blobs / Objects ~~~~~~~~~~~~~~~ -.. automodule:: gcloud.storage.blob +.. automodule:: google.cloud.storage.blob :members: :show-inheritance: diff --git a/docs/storage-buckets.rst b/docs/storage-buckets.rst index 44ed1118040d..e03b1f8b9b56 100644 --- a/docs/storage-buckets.rst +++ b/docs/storage-buckets.rst @@ -1,6 +1,6 @@ Buckets ~~~~~~~ -.. automodule:: gcloud.storage.bucket +.. automodule:: google.cloud.storage.bucket :members: :show-inheritance: diff --git a/docs/storage-client.rst b/docs/storage-client.rst index 9fb00e91f92f..9c73e60c0e3e 100644 --- a/docs/storage-client.rst +++ b/docs/storage-client.rst @@ -1,13 +1,13 @@ Storage Client ============== -.. automodule:: gcloud.storage.client +.. automodule:: google.cloud.storage.client :members: :show-inheritance: Connection ~~~~~~~~~~ -.. automodule:: gcloud.storage.connection +.. automodule:: google.cloud.storage.connection :members: :show-inheritance: diff --git a/docs/translate-client.rst b/docs/translate-client.rst index 14c76ba9d6c0..c724c9f2fe03 100644 --- a/docs/translate-client.rst +++ b/docs/translate-client.rst @@ -1,7 +1,7 @@ Translate Client ================ -.. automodule:: gcloud.translate.client +.. automodule:: google.cloud.translate.client :members: :undoc-members: :show-inheritance: @@ -9,7 +9,7 @@ Translate Client Connection ~~~~~~~~~~ -.. automodule:: gcloud.translate.connection +.. automodule:: google.cloud.translate.connection :members: :undoc-members: :show-inheritance: diff --git a/docs/translate-usage.rst b/docs/translate-usage.rst index f79f7e07d1c5..501a402f9cef 100644 --- a/docs/translate-usage.rst +++ b/docs/translate-usage.rst @@ -10,15 +10,15 @@ paid service. See the `Pricing`_ and `FAQ`_ pages for details. Authentication / Configuration ------------------------------ -- Use :class:`~gcloud.translate.client.Client` objects to configure +- Use :class:`~google.cloud.translate.client.Client` objects to configure your applications. -- :class:`~gcloud.translate.client.Client` objects hold both a ``key`` +- :class:`~google.cloud.translate.client.Client` objects hold both a ``key`` and a connection to the Translate service. - **An API key is required for Translate.** See `Identifying your application to Google`_ for details. This is - significantly different than the other clients in ``gcloud-python``. + significantly different than the other clients in ``google-cloud-python``. Methods ------- @@ -27,7 +27,7 @@ To create a client: .. code:: - >>> from gcloud import translate + >>> from google.cloud import translate >>> client = translate.Client('my-api-key') By default, the client targets English when doing detections @@ -36,20 +36,20 @@ well: .. code:: - >>> from gcloud import translate + >>> from google.cloud import translate >>> client = translate.Client('my-api-key', target_language='es') The Google Translate API has three supported methods, and they map to three methods on a client: -:meth:`~gcloud.translate.client.Client.get_languages`, -:meth:`~gcloud.translate.client.Client.detect_language` and -:meth:`~gcloud.translate.client.Client.translate`. +:meth:`~google.cloud.translate.client.Client.get_languages`, +:meth:`~google.cloud.translate.client.Client.detect_language` and +:meth:`~google.cloud.translate.client.Client.translate`. To get a list of languages supported by Google Translate .. code:: - >>> from gcloud import translate + >>> from google.cloud import translate >>> client = translate.Client('my-api-key') >>> client.get_languages() [ @@ -64,7 +64,7 @@ To detect the language that some given text is written in: .. code:: - >>> from gcloud import translate + >>> from google.cloud import translate >>> client = translate.Client('my-api-key') >>> client.detect_language(['Me llamo', 'I am']) [ @@ -87,7 +87,7 @@ To translate text: .. code:: - >>> from gcloud import translate + >>> from google.cloud import translate >>> client = translate.Client('my-api-key') >>> client.translate('koszula') { @@ -100,7 +100,7 @@ or to use a non-default target language: .. code:: - >>> from gcloud import translate + >>> from google.cloud import translate >>> client = translate.Client('my-api-key') >>> client.translate(['Me llamo Jeff', 'My name is Jeff'], ... target_language='de') diff --git a/docs/vision-client.rst b/docs/vision-client.rst index 50fd31862f06..f7f9fd259ce4 100644 --- a/docs/vision-client.rst +++ b/docs/vision-client.rst @@ -4,7 +4,7 @@ Vision Client Client ~~~~~~ -.. automodule:: gcloud.vision.client +.. automodule:: google.cloud.vision.client :members: :undoc-members: :show-inheritance: @@ -12,7 +12,7 @@ Client Connection ~~~~~~~~~~ -.. automodule:: gcloud.vision.connection +.. automodule:: google.cloud.vision.connection :members: :undoc-members: :show-inheritance: diff --git a/docs/vision-feature.rst b/docs/vision-feature.rst index d88fa0741288..325b0caad717 100644 --- a/docs/vision-feature.rst +++ b/docs/vision-feature.rst @@ -4,7 +4,7 @@ Vision Feature Feature ~~~~~~~ -.. automodule:: gcloud.vision.feature +.. automodule:: google.cloud.vision.feature :members: :undoc-members: :show-inheritance: diff --git a/docs/vision-image.rst b/docs/vision-image.rst index d08a90f48f82..e22be7161d22 100644 --- a/docs/vision-image.rst +++ b/docs/vision-image.rst @@ -4,7 +4,7 @@ Vision Image Image ~~~~~ -.. automodule:: gcloud.vision.image +.. automodule:: google.cloud.vision.image :members: :undoc-members: :show-inheritance: diff --git a/docs/vision-usage.rst b/docs/vision-usage.rst index 71d6ca61fc52..461ee9e19e27 100644 --- a/docs/vision-usage.rst +++ b/docs/vision-usage.rst @@ -4,30 +4,30 @@ Using the Vision API Authentication and Configuration -------------------------------- -- For an overview of authentication in ``gcloud-python``, +- For an overview of authentication in ``google-cloud-python``, see :doc:`gcloud-auth`. - In addition to any authentication configuration, you should also set the - :envvar:`GCLOUD_PROJECT` environment variable for the project you'd like - to interact with. If the GCLOUD_PROJECT environment variable is not present, + :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:`Client ` + :class:`Client ` .. code-block:: python - >>> from gcloud import vision + >>> from google.cloud import vision >>> client = vision.Client() or pass in ``credentials`` and ``project`` explicitly .. code-block:: python - >>> from gcloud import vision + >>> from google.cloud import vision >>> client = vision.Client(project='my-project', credentials=creds) Annotating an Image @@ -38,7 +38,7 @@ Annotate a single image .. code-block:: python - >>> from gcloud import vision + >>> from google.cloud import vision >>> client = vision.Client() >>> image = client.image('./image.png') >>> faces = image.detect_faces(limit=10) @@ -70,7 +70,7 @@ Failing annotations return no results for the feature type requested. .. code-block:: python - >>> from gcloud import vision + >>> from google.cloud import vision >>> client = vision.Client() >>> image = client.image('./image.jpg') >>> logos = image.detect_logos(limit=10) @@ -85,7 +85,7 @@ You can call the detection method manually. .. code-block:: python - >>> from gcloud import vision + >>> from google.cloud import vision >>> client = vision.Client() >>> image = client.image('gs://my-test-bucket/image.jpg') >>> faces = image.detect(type=vision.FACE_DETECTION, limit=10) @@ -100,7 +100,7 @@ see: https://cloud.google.com/vision/reference/rest/v1/images/annotate#type_1 .. code-block:: python - >>> from gcloud import vision + >>> from google.cloud import vision >>> client = vision.Client() >>> image = client.image('./image.jpg') >>> faces = image.detect_faces(limit=10) @@ -126,7 +126,7 @@ attempt to identify those objects. .. code-block:: python - >>> from gcloud import vision + >>> from google.cloud import vision >>> client = vision.Client() >>> image = client.image('./image.jpg') >>> labels = image.detect_labels(limit=3) @@ -145,7 +145,7 @@ locations if available. .. code-block:: python - >>> from gcloud import vision + >>> from google.cloud import vision >>> client = vision.Client() >>> image = client.image('./image.jpg') >>> landmarks = image.detect_landmarks() @@ -167,7 +167,7 @@ Google Vision can also attempt to detect company and brand logos in images. .. code-block:: python - >>> from gcloud import vision + >>> from google.cloud import vision >>> client = vision.Client() >>> image = client.image('./image.jpg') >>> logos = image.detect_logos(limit=1) @@ -187,7 +187,7 @@ Detecting safe search properties of an image. .. code-block:: python - >>> from gcloud import vision + >>> from google.cloud import vision >>> client = vision.Client() >>> image = client.image('./image.jpg') >>> safe_search = image.detect_safe_search() @@ -203,7 +203,7 @@ Detecting text with ORC from an image. .. code-block:: python - >>> from gcloud import vision + >>> from google.cloud import vision >>> client = vision.Client() >>> image = client.image('./image.jpg') >>> text = image.detect_text() @@ -219,7 +219,7 @@ Detecting image color properties. .. code-block:: python - >>> from gcloud import vision + >>> from google.cloud import vision >>> client = vision.Client() >>> image = client.image('./image.jpg') >>> colors = image.detect_properties() diff --git a/google/__init__.py b/google/__init__.py new file mode 100644 index 000000000000..14aa202c24c1 --- /dev/null +++ b/google/__init__.py @@ -0,0 +1,22 @@ +# 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. + +"""Base ``google`` namespace package.""" + +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/gcloud/__init__.py b/google/cloud/__init__.py similarity index 73% rename from gcloud/__init__.py rename to google/cloud/__init__.py index 8c1c7b4e97e2..1768fdd079a2 100644 --- a/gcloud/__init__.py +++ b/google/cloud/__init__.py @@ -12,8 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""GCloud API access in idiomatic Python.""" +"""Google Cloud API access in idiomatic Python.""" -from pkg_resources import get_distribution - -__version__ = get_distribution('gcloud').version +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/gcloud/_helpers.py b/google/cloud/_helpers.py similarity index 97% rename from gcloud/_helpers.py rename to google/cloud/_helpers.py index fe3398667eb7..3f76827e1424 100644 --- a/gcloud/_helpers.py +++ b/google/cloud/_helpers.py @@ -11,9 +11,10 @@ # 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. -"""Thread-local resource stack. -This module is not part of the public API surface of `gcloud`. +"""Shared helpers for Google Cloud packages. + +This module is not part of the public API surface. """ import calendar @@ -41,8 +42,10 @@ from six.moves.http_client import HTTPConnection from six.moves import configparser -from gcloud.environment_vars import PROJECT -from gcloud.environment_vars import CREDENTIALS +# pylint: disable=ungrouped-imports +from google.cloud.environment_vars import PROJECT +from google.cloud.environment_vars import CREDENTIALS +# pylint: enable=ungrouped-imports _NOW = datetime.datetime.utcnow # To be replaced by tests. @@ -72,8 +75,8 @@ class _LocalStack(Local): """Manage a thread-local LIFO stack of resources. - Intended for use in :class:`gcloud.datastore.batch.Batch.__enter__`, - :class:`gcloud.storage.batch.Batch.__enter__`, etc. + Intended for use in :class:`google.cloud.datastore.batch.Batch.__enter__`, + :class:`google.cloud.storage.batch.Batch.__enter__`, etc. """ def __init__(self): super(_LocalStack, self).__init__() @@ -290,7 +293,7 @@ def _determine_default_project(project=None): In implicit case, supports three environments. In order of precedence, the implicit environments are: - * GCLOUD_PROJECT environment variable + * GOOGLE_CLOUD_PROJECT environment variable * GOOGLE_APPLICATION_CREDENTIALS JSON file * Get default service project from ``$ gcloud beta auth application-default login`` diff --git a/gcloud/bigquery/__init__.py b/google/cloud/bigquery/__init__.py similarity index 59% rename from gcloud/bigquery/__init__.py rename to google/cloud/bigquery/__init__.py index 9bf5ab4767e3..fd358aa9f54b 100644 --- a/gcloud/bigquery/__init__.py +++ b/google/cloud/bigquery/__init__.py @@ -16,17 +16,19 @@ The main concepts with this API are: -- :class:`gcloud.bigquery.dataset.Dataset` represents an collection of tables. +- :class:`~google.cloud.bigquery.dataset.Dataset` represents a + collection of tables. -- :class:`gcloud.bigquery.table.Table` represents a single "relation". +- :class:`~google.cloud.bigquery.table.Table` represents a single "relation". """ -from gcloud.bigquery.client import Client -from gcloud.bigquery.connection import Connection -from gcloud.bigquery.dataset import AccessGrant -from gcloud.bigquery.dataset import Dataset -from gcloud.bigquery.schema import SchemaField -from gcloud.bigquery.table import Table + +from google.cloud.bigquery.client import Client +from google.cloud.bigquery.connection import Connection +from google.cloud.bigquery.dataset import AccessGrant +from google.cloud.bigquery.dataset import Dataset +from google.cloud.bigquery.schema import SchemaField +from google.cloud.bigquery.table import Table SCOPE = Connection.SCOPE diff --git a/gcloud/bigquery/_helpers.py b/google/cloud/bigquery/_helpers.py similarity index 98% rename from gcloud/bigquery/_helpers.py rename to google/cloud/bigquery/_helpers.py index d149ecb181d0..88a0944c48f3 100644 --- a/gcloud/bigquery/_helpers.py +++ b/google/cloud/bigquery/_helpers.py @@ -14,7 +14,7 @@ """Shared helper functions for BigQuery API classes.""" -from gcloud._helpers import _datetime_from_microseconds +from google.cloud._helpers import _datetime_from_microseconds def _not_null(value, field): diff --git a/gcloud/bigquery/client.py b/google/cloud/bigquery/client.py similarity index 85% rename from gcloud/bigquery/client.py rename to google/cloud/bigquery/client.py index d831e248682a..d5560329ee5d 100644 --- a/gcloud/bigquery/client.py +++ b/google/cloud/bigquery/client.py @@ -15,14 +15,14 @@ """Client for interacting with the Google BigQuery API.""" -from gcloud.client import JSONClient -from gcloud.bigquery.connection import Connection -from gcloud.bigquery.dataset import Dataset -from gcloud.bigquery.job import CopyJob -from gcloud.bigquery.job import ExtractTableToStorageJob -from gcloud.bigquery.job import LoadTableFromStorageJob -from gcloud.bigquery.job import QueryJob -from gcloud.bigquery.query import QueryResults +from google.cloud.client import JSONClient +from google.cloud.bigquery.connection import Connection +from google.cloud.bigquery.dataset import Dataset +from google.cloud.bigquery.job import CopyJob +from google.cloud.bigquery.job import ExtractTableToStorageJob +from google.cloud.bigquery.job import LoadTableFromStorageJob +from google.cloud.bigquery.job import QueryJob +from google.cloud.bigquery.query import QueryResults class Client(JSONClient): @@ -68,8 +68,8 @@ def list_datasets(self, include_all=False, max_results=None, datasets. :rtype: tuple, (list, str) - :returns: list of :class:`gcloud.bigquery.dataset.Dataset`, plus a - "next page token" string: if the token is not None, + :returns: list of :class:`~google.cloud.bigquery.dataset.Dataset`, + plus a "next page token" string: if the token is not None, indicates that more datasets can be retrieved with another call (pass that value as ``page_token``). """ @@ -97,7 +97,7 @@ def dataset(self, dataset_name): :type dataset_name: str :param dataset_name: Name of the dataset. - :rtype: :class:`gcloud.bigquery.dataset.Dataset` + :rtype: :class:`google.cloud.bigquery.dataset.Dataset` :returns: a new ``Dataset`` instance """ return Dataset(dataset_name, client=self) @@ -109,11 +109,11 @@ def job_from_resource(self, resource): :param resource: one job resource from API response :rtype: One of: - :class:`gcloud.bigquery.job.LoadTableFromStorageJob`, - :class:`gcloud.bigquery.job.CopyJob`, - :class:`gcloud.bigquery.job.ExtractTableToStorageJob`, - :class:`gcloud.bigquery.job.QueryJob`, - :class:`gcloud.bigquery.job.RunSyncQueryJob` + :class:`google.cloud.bigquery.job.LoadTableFromStorageJob`, + :class:`google.cloud.bigquery.job.CopyJob`, + :class:`google.cloud.bigquery.job.ExtractTableToStorageJob`, + :class:`google.cloud.bigquery.job.QueryJob`, + :class:`google.cloud.bigquery.job.RunSyncQueryJob` :returns: the job instance, constructed via the resource """ config = resource['configuration'] @@ -191,14 +191,14 @@ def load_table_from_storage(self, job_name, destination, *source_uris): :type job_name: str :param job_name: Name of the job. - :type destination: :class:`gcloud.bigquery.table.Table` + :type destination: :class:`google.cloud.bigquery.table.Table` :param destination: Table into which data is to be loaded. :type source_uris: sequence of string :param source_uris: URIs of data files to be loaded; in format ``gs:///``. - :rtype: :class:`gcloud.bigquery.job.LoadTableFromStorageJob` + :rtype: :class:`google.cloud.bigquery.job.LoadTableFromStorageJob` :returns: a new ``LoadTableFromStorageJob`` instance """ return LoadTableFromStorageJob(job_name, destination, source_uris, @@ -213,13 +213,13 @@ def copy_table(self, job_name, destination, *sources): :type job_name: str :param job_name: Name of the job. - :type destination: :class:`gcloud.bigquery.table.Table` + :type destination: :class:`google.cloud.bigquery.table.Table` :param destination: Table into which data is to be copied. - :type sources: sequence of :class:`gcloud.bigquery.table.Table` + :type sources: sequence of :class:`google.cloud.bigquery.table.Table` :param sources: tables to be copied. - :rtype: :class:`gcloud.bigquery.job.CopyJob` + :rtype: :class:`google.cloud.bigquery.job.CopyJob` :returns: a new ``CopyJob`` instance """ return CopyJob(job_name, destination, sources, client=self) @@ -233,7 +233,7 @@ def extract_table_to_storage(self, job_name, source, *destination_uris): :type job_name: str :param job_name: Name of the job. - :type source: :class:`gcloud.bigquery.table.Table` + :type source: :class:`google.cloud.bigquery.table.Table` :param source: table to be extracted. :type destination_uris: sequence of string @@ -241,7 +241,7 @@ def extract_table_to_storage(self, job_name, source, *destination_uris): table data is to be extracted; in format ``gs:///``. - :rtype: :class:`gcloud.bigquery.job.ExtractTableToStorageJob` + :rtype: :class:`google.cloud.bigquery.job.ExtractTableToStorageJob` :returns: a new ``ExtractTableToStorageJob`` instance """ return ExtractTableToStorageJob(job_name, source, destination_uris, @@ -259,7 +259,7 @@ def run_async_query(self, job_name, query): :type query: str :param query: SQL query to be executed - :rtype: :class:`gcloud.bigquery.job.QueryJob` + :rtype: :class:`google.cloud.bigquery.job.QueryJob` :returns: a new ``QueryJob`` instance """ return QueryJob(job_name, query, client=self) @@ -270,7 +270,7 @@ def run_sync_query(self, query): :type query: str :param query: SQL query to be executed - :rtype: :class:`gcloud.bigquery.query.QueryResults` + :rtype: :class:`google.cloud.bigquery.query.QueryResults` :returns: a new ``QueryResults`` instance """ return QueryResults(query, client=self) diff --git a/gcloud/bigquery/connection.py b/google/cloud/bigquery/connection.py similarity index 91% rename from gcloud/bigquery/connection.py rename to google/cloud/bigquery/connection.py index 6195c1a4b0e8..06e699efa28c 100644 --- a/gcloud/bigquery/connection.py +++ b/google/cloud/bigquery/connection.py @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Create / interact with gcloud bigquery connections.""" +"""Create / interact with Google Cloud BigQuery connections.""" -from gcloud import connection as base_connection +from google.cloud import connection as base_connection class Connection(base_connection.JSONConnection): diff --git a/gcloud/bigquery/dataset.py b/google/cloud/bigquery/dataset.py similarity index 93% rename from gcloud/bigquery/dataset.py rename to google/cloud/bigquery/dataset.py index 36ce1475c2a4..f4f1443d1aec 100644 --- a/gcloud/bigquery/dataset.py +++ b/google/cloud/bigquery/dataset.py @@ -15,9 +15,9 @@ """Define API Datasets.""" import six -from gcloud._helpers import _datetime_from_microseconds -from gcloud.exceptions import NotFound -from gcloud.bigquery.table import Table +from google.cloud._helpers import _datetime_from_microseconds +from google.cloud.exceptions import NotFound +from google.cloud.bigquery.table import Table class AccessGrant(object): @@ -94,7 +94,7 @@ class Dataset(object): :type name: string :param name: the name of the dataset - :type client: :class:`gcloud.bigquery.client.Client` + :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). @@ -298,11 +298,11 @@ def from_api_repr(cls, resource, client): :type resource: dict :param resource: dataset resource representation returned from the API - :type client: :class:`gcloud.bigquery.client.Client` + :type client: :class:`google.cloud.bigquery.client.Client` :param client: Client which holds credentials and project configuration for the dataset. - :rtype: :class:`gcloud.bigquery.dataset.Dataset` + :rtype: :class:`google.cloud.bigquery.dataset.Dataset` :returns: Dataset parsed from ``resource``. """ if ('datasetReference' not in resource or @@ -317,11 +317,12 @@ def from_api_repr(cls, resource, client): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. - :rtype: :class:`gcloud.bigquery.client.Client` + :rtype: :class:`google.cloud.bigquery.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -413,7 +414,8 @@ def create(self, client=None): See: https://cloud.google.com/bigquery/docs/reference/v2/tables/insert - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. """ @@ -429,7 +431,8 @@ def exists(self, client=None): See https://cloud.google.com/bigquery/docs/reference/v2/datasets/get - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. @@ -452,7 +455,8 @@ def reload(self, client=None): See https://cloud.google.com/bigquery/docs/reference/v2/datasets/get - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. """ @@ -468,7 +472,8 @@ def patch(self, client=None, **kw): See https://cloud.google.com/bigquery/docs/reference/v2/datasets/patch - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. @@ -506,7 +511,8 @@ def update(self, client=None): See https://cloud.google.com/bigquery/docs/reference/v2/datasets/update - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. """ @@ -521,7 +527,8 @@ def delete(self, client=None): See: https://cloud.google.com/bigquery/docs/reference/v2/tables/delete - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. """ @@ -544,7 +551,7 @@ def list_tables(self, max_results=None, page_token=None): datasets. :rtype: tuple, (list, str) - :returns: list of :class:`gcloud.bigquery.table.Table`, plus a + :returns: list of :class:`google.cloud.bigquery.table.Table`, plus a "next page token" string: if not ``None``, indicates that more tables can be retrieved with another call (pass that value as ``page_token``). @@ -571,10 +578,10 @@ def table(self, name, schema=()): :type name: string :param name: Name of the table. - :type schema: list of :class:`gcloud.bigquery.table.SchemaField` + :type schema: list of :class:`google.cloud.bigquery.table.SchemaField` :param schema: The table's schema - :rtype: :class:`gcloud.bigquery.table.Table` + :rtype: :class:`google.cloud.bigquery.table.Table` :returns: a new ``Table`` instance """ return Table(name, dataset=self, schema=schema) diff --git a/gcloud/bigquery/job.py b/google/cloud/bigquery/job.py similarity index 93% rename from gcloud/bigquery/job.py rename to google/cloud/bigquery/job.py index 40bf52f73455..9c639ea79fa0 100644 --- a/gcloud/bigquery/job.py +++ b/google/cloud/bigquery/job.py @@ -16,15 +16,15 @@ import six -from gcloud.exceptions import NotFound -from gcloud._helpers import _datetime_from_microseconds -from gcloud.bigquery.dataset import Dataset -from gcloud.bigquery.schema import SchemaField -from gcloud.bigquery.table import Table -from gcloud.bigquery.table import _build_schema_resource -from gcloud.bigquery.table import _parse_schema_resource -from gcloud.bigquery._helpers import _EnumProperty -from gcloud.bigquery._helpers import _TypedProperty +from google.cloud.exceptions import NotFound +from google.cloud._helpers import _datetime_from_microseconds +from google.cloud.bigquery.dataset import Dataset +from google.cloud.bigquery.schema import SchemaField +from google.cloud.bigquery.table import Table +from google.cloud.bigquery.table import _build_schema_resource +from google.cloud.bigquery.table import _parse_schema_resource +from google.cloud.bigquery._helpers import _EnumProperty +from google.cloud.bigquery._helpers import _TypedProperty class UDFResource(object): @@ -66,7 +66,7 @@ def _build_udf_resources(resources): class UDFResourcesProperty(object): """Custom property type for :class:`QueryJob`. - Also used by :class:`~gcloud.bigquery.query.Query`. + Also used by :class:`~google.cloud.bigquery.query.Query`. """ def __get__(self, instance, owner): """Descriptor protocol: accessor""" @@ -136,7 +136,7 @@ class WriteDisposition(_EnumProperty): class _BaseJob(object): """Base class for jobs. - :type client: :class:`gcloud.bigquery.client.Client` + :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). """ @@ -156,11 +156,12 @@ def project(self): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. - :rtype: :class:`gcloud.bigquery.client.Client` + :rtype: :class:`google.cloud.bigquery.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -174,7 +175,7 @@ class _AsyncJob(_BaseJob): :type name: string :param name: the name of the job - :type client: :class:`gcloud.bigquery.client.Client` + :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). """ @@ -354,7 +355,8 @@ def begin(self, client=None): See: https://cloud.google.com/bigquery/docs/reference/v2/jobs/insert - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. """ @@ -370,7 +372,8 @@ def exists(self, client=None): See https://cloud.google.com/bigquery/docs/reference/v2/jobs/get - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. @@ -393,7 +396,8 @@ def reload(self, client=None): See https://cloud.google.com/bigquery/docs/reference/v2/jobs/get - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. """ @@ -409,7 +413,8 @@ def cancel(self, client=None): See https://cloud.google.com/bigquery/docs/reference/v2/jobs/cancel - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. """ @@ -444,18 +449,18 @@ class LoadTableFromStorageJob(_AsyncJob): :type name: string :param name: the name of the job - :type destination: :class:`gcloud.bigquery.table.Table` + :type destination: :class:`google.cloud.bigquery.table.Table` :param destination: Table into which data is to be loaded. :type source_uris: sequence of string :param source_uris: URIs of one or more data files to be loaded, in format ``gs:///``. - :type client: :class:`gcloud.bigquery.client.Client` + :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). - :type schema: list of :class:`gcloud.bigquery.table.SchemaField` + :type schema: list of :class:`google.cloud.bigquery.table.SchemaField` :param schema: The job's schema """ @@ -661,11 +666,11 @@ def from_api_repr(cls, resource, client): :type resource: dict :param resource: dataset job representation returned from the API - :type client: :class:`gcloud.bigquery.client.Client` + :type client: :class:`google.cloud.bigquery.client.Client` :param client: Client which holds credentials and project configuration for the dataset. - :rtype: :class:`gcloud.bigquery.job.LoadTableFromStorageJob` + :rtype: :class:`google.cloud.bigquery.job.LoadTableFromStorageJob` :returns: Job parsed from ``resource``. """ name, config = cls._get_resource_config(resource) @@ -693,13 +698,13 @@ class CopyJob(_AsyncJob): :type name: string :param name: the name of the job - :type destination: :class:`gcloud.bigquery.table.Table` + :type destination: :class:`google.cloud.bigquery.table.Table` :param destination: Table into which data is to be loaded. - :type sources: list of :class:`gcloud.bigquery.table.Table` + :type sources: list of :class:`google.cloud.bigquery.table.Table` :param sources: Table into which data is to be loaded. - :type client: :class:`gcloud.bigquery.client.Client` + :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). """ @@ -771,11 +776,11 @@ def from_api_repr(cls, resource, client): :type resource: dict :param resource: dataset job representation returned from the API - :type client: :class:`gcloud.bigquery.client.Client` + :type client: :class:`google.cloud.bigquery.client.Client` :param client: Client which holds credentials and project configuration for the dataset. - :rtype: :class:`gcloud.bigquery.job.CopyJob` + :rtype: :class:`google.cloud.bigquery.job.CopyJob` :returns: Job parsed from ``resource``. """ name, config = cls._get_resource_config(resource) @@ -808,7 +813,7 @@ class ExtractTableToStorageJob(_AsyncJob): :type name: string :param name: the name of the job - :type source: :class:`gcloud.bigquery.table.Table` + :type source: :class:`google.cloud.bigquery.table.Table` :param source: Table into which data is to be loaded. :type destination_uris: list of string @@ -816,7 +821,7 @@ class ExtractTableToStorageJob(_AsyncJob): extracted data will be written, in format ``gs:///``. - :type client: :class:`gcloud.bigquery.client.Client` + :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). """ @@ -897,11 +902,11 @@ def from_api_repr(cls, resource, client): :type resource: dict :param resource: dataset job representation returned from the API - :type client: :class:`gcloud.bigquery.client.Client` + :type client: :class:`google.cloud.bigquery.client.Client` :param client: Client which holds credentials and project configuration for the dataset. - :rtype: :class:`gcloud.bigquery.job.ExtractTableToStorageJob` + :rtype: :class:`google.cloud.bigquery.job.ExtractTableToStorageJob` :returns: Job parsed from ``resource``. """ name, config = cls._get_resource_config(resource) @@ -939,13 +944,13 @@ class QueryJob(_AsyncJob): :type query: string :param query: SQL query string - :type client: :class:`gcloud.bigquery.client.Client` + :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). :type udf_resources: tuple :param udf_resources: An iterable of - :class:`gcloud.bigquery.job.UDFResource` + :class:`google.cloud.bigquery.job.UDFResource` (empty by default) """ _JOB_TYPE = 'query' @@ -1092,11 +1097,11 @@ def from_api_repr(cls, resource, client): :type resource: dict :param resource: dataset job representation returned from the API - :type client: :class:`gcloud.bigquery.client.Client` + :type client: :class:`google.cloud.bigquery.client.Client` :param client: Client which holds credentials and project configuration for the dataset. - :rtype: :class:`gcloud.bigquery.job.RunAsyncQueryJob` + :rtype: :class:`google.cloud.bigquery.job.RunAsyncQueryJob` :returns: Job parsed from ``resource``. """ name, config = cls._get_resource_config(resource) diff --git a/gcloud/bigquery/query.py b/google/cloud/bigquery/query.py similarity index 92% rename from gcloud/bigquery/query.py rename to google/cloud/bigquery/query.py index e436255253a7..bc4e23a2ff82 100644 --- a/gcloud/bigquery/query.py +++ b/google/cloud/bigquery/query.py @@ -16,13 +16,13 @@ import six -from gcloud.bigquery._helpers import _TypedProperty -from gcloud.bigquery._helpers import _rows_from_json -from gcloud.bigquery.dataset import Dataset -from gcloud.bigquery.job import QueryJob -from gcloud.bigquery.job import UDFResourcesProperty -from gcloud.bigquery.job import _build_udf_resources -from gcloud.bigquery.table import _parse_schema_resource +from google.cloud.bigquery._helpers import _TypedProperty +from google.cloud.bigquery._helpers import _rows_from_json +from google.cloud.bigquery.dataset import Dataset +from google.cloud.bigquery.job import QueryJob +from google.cloud.bigquery.job import UDFResourcesProperty +from google.cloud.bigquery.job import _build_udf_resources +from google.cloud.bigquery.table import _parse_schema_resource class _SyncQueryConfiguration(object): @@ -45,13 +45,13 @@ class QueryResults(object): :type query: string :param query: SQL query string - :type client: :class:`gcloud.bigquery.client.Client` + :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). :type udf_resources: tuple :param udf_resources: An iterable of - :class:`gcloud.bigquery.job.UDFResource` + :class:`google.cloud.bigquery.job.UDFResource` (empty by default) """ @@ -77,11 +77,12 @@ def project(self): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. - :rtype: :class:`gcloud.bigquery.client.Client` + :rtype: :class:`google.cloud.bigquery.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -144,7 +145,7 @@ def name(self): def job(self): """Job instance used to run the query. - :rtype: :class:`gcloud.bigquery.job.QueryJob`, or ``NoneType`` + :rtype: :class:`google.cloud.bigquery.job.QueryJob`, or ``NoneType`` :returns: Job instance used to run the query (None until ``jobReference`` property is set by the server). """ @@ -301,7 +302,8 @@ def run(self, client=None): See: https://cloud.google.com/bigquery/docs/reference/v2/jobs/query - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. """ @@ -331,7 +333,8 @@ def fetch_data(self, max_results=None, page_token=None, start_index=None, :param timeout_ms: timeout, in milliseconds, to wait for query to complete - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. diff --git a/gcloud/bigquery/schema.py b/google/cloud/bigquery/schema.py similarity index 100% rename from gcloud/bigquery/schema.py rename to google/cloud/bigquery/schema.py diff --git a/gcloud/bigquery/table.py b/google/cloud/bigquery/table.py similarity index 92% rename from gcloud/bigquery/table.py rename to google/cloud/bigquery/table.py index edd351f75340..115338810a62 100644 --- a/gcloud/bigquery/table.py +++ b/google/cloud/bigquery/table.py @@ -20,16 +20,16 @@ import six -from gcloud._helpers import _datetime_from_microseconds -from gcloud._helpers import _microseconds_from_datetime -from gcloud._helpers import _millis_from_datetime -from gcloud.exceptions import NotFound -from gcloud.streaming.http_wrapper import Request -from gcloud.streaming.http_wrapper import make_api_request -from gcloud.streaming.transfer import RESUMABLE_UPLOAD -from gcloud.streaming.transfer import Upload -from gcloud.bigquery.schema import SchemaField -from gcloud.bigquery._helpers import _rows_from_json +from google.cloud._helpers import _datetime_from_microseconds +from google.cloud._helpers import _microseconds_from_datetime +from google.cloud._helpers import _millis_from_datetime +from google.cloud.exceptions import NotFound +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 _rows_from_json _MARKER = object() @@ -44,7 +44,7 @@ class Table(object): :type name: str :param name: the name of the table - :type dataset: :class:`gcloud.bigquery.dataset.Dataset` + :type dataset: :class:`google.cloud.bigquery.dataset.Dataset` :param dataset: The dataset which contains the table. :type schema: list of :class:`SchemaField` @@ -368,7 +368,8 @@ def view_query(self): def list_partitions(self, client=None): """List the partitions in a table. - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. @@ -388,10 +389,10 @@ def from_api_repr(cls, resource, dataset): :type resource: dict :param resource: table resource representation returned from the API - :type dataset: :class:`gcloud.bigquery.dataset.Dataset` + :type dataset: :class:`google.cloud.bigquery.dataset.Dataset` :param dataset: The dataset containing the table. - :rtype: :class:`gcloud.bigquery.table.Table` + :rtype: :class:`google.cloud.bigquery.table.Table` :returns: Table parsed from ``resource``. """ if ('tableReference' not in resource or @@ -406,11 +407,12 @@ def from_api_repr(cls, resource, dataset): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. - :rtype: :class:`gcloud.bigquery.client.Client` + :rtype: :class:`google.cloud.bigquery.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -477,7 +479,8 @@ def create(self, client=None): See: https://cloud.google.com/bigquery/docs/reference/v2/tables/insert - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. """ @@ -494,7 +497,8 @@ def exists(self, client=None): See https://cloud.google.com/bigquery/docs/reference/v2/tables/get - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. @@ -517,7 +521,8 @@ def reload(self, client=None): See https://cloud.google.com/bigquery/docs/reference/v2/tables/get - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. """ @@ -540,7 +545,8 @@ def patch(self, See https://cloud.google.com/bigquery/docs/reference/v2/tables/patch - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. @@ -606,7 +612,8 @@ def update(self, client=None): See https://cloud.google.com/bigquery/docs/reference/v2/tables/update - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. """ @@ -621,7 +628,8 @@ def delete(self, client=None): See: https://cloud.google.com/bigquery/docs/reference/v2/tables/delete - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. """ @@ -648,7 +656,8 @@ def fetch_data(self, max_results=None, page_token=None, client=None): :type page_token: str or ``NoneType`` :param page_token: token representing a cursor into the table's rows. - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. @@ -714,7 +723,8 @@ def insert_data(self, schema of the template table. See: https://cloud.google.com/bigquery/streaming-data-into-bigquery#template-tables - :type client: :class:`gcloud.bigquery.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.bigquery.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current dataset. @@ -796,7 +806,7 @@ def upload_from_file(self, :type source_format: str :param source_format: one of 'CSV' or 'NEWLINE_DELIMITED_JSON'. job configuration option; see - :meth:`gcloud.bigquery.job.LoadJob` + :meth:`google.cloud.bigquery.job.LoadJob` :type rewind: boolean :param rewind: If True, seek to the beginning of the file handle before @@ -813,49 +823,50 @@ def upload_from_file(self, :type allow_jagged_rows: boolean :param allow_jagged_rows: job configuration option; see - :meth:`gcloud.bigquery.job.LoadJob`. + :meth:`google.cloud.bigquery.job.LoadJob`. :type allow_quoted_newlines: boolean :param allow_quoted_newlines: job configuration option; see - :meth:`gcloud.bigquery.job.LoadJob`. + :meth:`google.cloud.bigquery.job.LoadJob`. :type create_disposition: str :param create_disposition: job configuration option; see - :meth:`gcloud.bigquery.job.LoadJob`. + :meth:`google.cloud.bigquery.job.LoadJob`. :type encoding: str :param encoding: job configuration option; see - :meth:`gcloud.bigquery.job.LoadJob`. + :meth:`google.cloud.bigquery.job.LoadJob`. :type field_delimiter: str :param field_delimiter: job configuration option; see - :meth:`gcloud.bigquery.job.LoadJob`. + :meth:`google.cloud.bigquery.job.LoadJob`. :type ignore_unknown_values: boolean :param ignore_unknown_values: job configuration option; see - :meth:`gcloud.bigquery.job.LoadJob`. + :meth:`google.cloud.bigquery.job.LoadJob`. :type max_bad_records: integer :param max_bad_records: job configuration option; see - :meth:`gcloud.bigquery.job.LoadJob`. + :meth:`google.cloud.bigquery.job.LoadJob`. :type quote_character: str :param quote_character: job configuration option; see - :meth:`gcloud.bigquery.job.LoadJob`. + :meth:`google.cloud.bigquery.job.LoadJob`. :type skip_leading_rows: integer :param skip_leading_rows: job configuration option; see - :meth:`gcloud.bigquery.job.LoadJob`. + :meth:`google.cloud.bigquery.job.LoadJob`. :type write_disposition: str :param write_disposition: job configuration option; see - :meth:`gcloud.bigquery.job.LoadJob`. + :meth:`google.cloud.bigquery.job.LoadJob`. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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. - :rtype: :class:`gcloud.bigquery.jobs.LoadTableFromStorageJob` + :rtype: :class:`google.cloud.bigquery.jobs.LoadTableFromStorageJob` :returns: the job instance used to load the data (e.g., for querying status). :raises: :class:`ValueError` if ``size`` is not passed in and can not diff --git a/gcloud/bigtable/__init__.py b/google/cloud/bigtable/__init__.py similarity index 96% rename from gcloud/bigtable/__init__.py rename to google/cloud/bigtable/__init__.py index ff3eb0aa709a..41b743afc051 100644 --- a/gcloud/bigtable/__init__.py +++ b/google/cloud/bigtable/__init__.py @@ -15,7 +15,7 @@ """Google Cloud Bigtable API package.""" -from gcloud.bigtable.client import Client +from google.cloud.bigtable.client import Client _ERR_MSG = """\ diff --git a/gcloud/bigtable/_generated/__init__.py b/google/cloud/bigtable/_generated/__init__.py similarity index 100% rename from gcloud/bigtable/_generated/__init__.py rename to google/cloud/bigtable/_generated/__init__.py diff --git a/gcloud/bigtable/_generated/_bigtable.proto b/google/cloud/bigtable/_generated/_bigtable.proto similarity index 100% rename from gcloud/bigtable/_generated/_bigtable.proto rename to google/cloud/bigtable/_generated/_bigtable.proto diff --git a/gcloud/bigtable/_generated/_bigtable_instance_admin.proto b/google/cloud/bigtable/_generated/_bigtable_instance_admin.proto similarity index 100% rename from gcloud/bigtable/_generated/_bigtable_instance_admin.proto rename to google/cloud/bigtable/_generated/_bigtable_instance_admin.proto diff --git a/gcloud/bigtable/_generated/_bigtable_table_admin.proto b/google/cloud/bigtable/_generated/_bigtable_table_admin.proto similarity index 100% rename from gcloud/bigtable/_generated/_bigtable_table_admin.proto rename to google/cloud/bigtable/_generated/_bigtable_table_admin.proto diff --git a/gcloud/bigtable/_generated/_common.proto b/google/cloud/bigtable/_generated/_common.proto similarity index 100% rename from gcloud/bigtable/_generated/_common.proto rename to google/cloud/bigtable/_generated/_common.proto diff --git a/gcloud/bigtable/_generated/_data.proto b/google/cloud/bigtable/_generated/_data.proto similarity index 100% rename from gcloud/bigtable/_generated/_data.proto rename to google/cloud/bigtable/_generated/_data.proto diff --git a/gcloud/bigtable/_generated/_instance.proto b/google/cloud/bigtable/_generated/_instance.proto similarity index 100% rename from gcloud/bigtable/_generated/_instance.proto rename to google/cloud/bigtable/_generated/_instance.proto diff --git a/gcloud/bigtable/_generated/_operations.proto b/google/cloud/bigtable/_generated/_operations.proto similarity index 100% rename from gcloud/bigtable/_generated/_operations.proto rename to google/cloud/bigtable/_generated/_operations.proto diff --git a/gcloud/bigtable/_generated/_table.proto b/google/cloud/bigtable/_generated/_table.proto similarity index 100% rename from gcloud/bigtable/_generated/_table.proto rename to google/cloud/bigtable/_generated/_table.proto diff --git a/gcloud/bigtable/_generated/bigtable_instance_admin_pb2.py b/google/cloud/bigtable/_generated/bigtable_instance_admin_pb2.py similarity index 99% rename from gcloud/bigtable/_generated/bigtable_instance_admin_pb2.py rename to google/cloud/bigtable/_generated/bigtable_instance_admin_pb2.py index e4d1bf87bcc2..e24d4b26ae26 100644 --- a/gcloud/bigtable/_generated/bigtable_instance_admin_pb2.py +++ b/google/cloud/bigtable/_generated/bigtable_instance_admin_pb2.py @@ -14,7 +14,7 @@ from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 -from gcloud.bigtable._generated import instance_pb2 as google_dot_bigtable_dot_admin_dot_v2_dot_instance__pb2 +from google.cloud.bigtable._generated import instance_pb2 as google_dot_bigtable_dot_admin_dot_v2_dot_instance__pb2 from google.longrunning import operations_pb2 as google_dot_longrunning_dot_operations__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 diff --git a/gcloud/bigtable/_generated/bigtable_pb2.py b/google/cloud/bigtable/_generated/bigtable_pb2.py similarity index 99% rename from gcloud/bigtable/_generated/bigtable_pb2.py rename to google/cloud/bigtable/_generated/bigtable_pb2.py index 3a6aaaf93ad9..04b269d72bf3 100644 --- a/gcloud/bigtable/_generated/bigtable_pb2.py +++ b/google/cloud/bigtable/_generated/bigtable_pb2.py @@ -14,7 +14,7 @@ from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 -from gcloud.bigtable._generated import data_pb2 as google_dot_bigtable_dot_v2_dot_data__pb2 +from google.cloud.bigtable._generated import data_pb2 as google_dot_bigtable_dot_v2_dot_data__pb2 from google.protobuf import wrappers_pb2 as google_dot_protobuf_dot_wrappers__pb2 from google.rpc import status_pb2 as google_dot_rpc_dot_status__pb2 diff --git a/gcloud/bigtable/_generated/bigtable_table_admin_pb2.py b/google/cloud/bigtable/_generated/bigtable_table_admin_pb2.py similarity index 99% rename from gcloud/bigtable/_generated/bigtable_table_admin_pb2.py rename to google/cloud/bigtable/_generated/bigtable_table_admin_pb2.py index e57a26f3512c..7368c0bf4e59 100644 --- a/gcloud/bigtable/_generated/bigtable_table_admin_pb2.py +++ b/google/cloud/bigtable/_generated/bigtable_table_admin_pb2.py @@ -14,7 +14,7 @@ from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 -from gcloud.bigtable._generated import table_pb2 as google_dot_bigtable_dot_admin_dot_v2_dot_table__pb2 +from google.cloud.bigtable._generated import table_pb2 as google_dot_bigtable_dot_admin_dot_v2_dot_table__pb2 from google.protobuf import empty_pb2 as google_dot_protobuf_dot_empty__pb2 diff --git a/gcloud/bigtable/_generated/common_pb2.py b/google/cloud/bigtable/_generated/common_pb2.py similarity index 100% rename from gcloud/bigtable/_generated/common_pb2.py rename to google/cloud/bigtable/_generated/common_pb2.py diff --git a/gcloud/bigtable/_generated/data_pb2.py b/google/cloud/bigtable/_generated/data_pb2.py similarity index 100% rename from gcloud/bigtable/_generated/data_pb2.py rename to google/cloud/bigtable/_generated/data_pb2.py diff --git a/gcloud/bigtable/_generated/instance_pb2.py b/google/cloud/bigtable/_generated/instance_pb2.py similarity index 98% rename from gcloud/bigtable/_generated/instance_pb2.py rename to google/cloud/bigtable/_generated/instance_pb2.py index b34379864f8b..8d4383d31e79 100644 --- a/gcloud/bigtable/_generated/instance_pb2.py +++ b/google/cloud/bigtable/_generated/instance_pb2.py @@ -14,7 +14,7 @@ from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 -from gcloud.bigtable._generated import common_pb2 as google_dot_bigtable_dot_admin_dot_v2_dot_common__pb2 +from google.cloud.bigtable._generated import common_pb2 as google_dot_bigtable_dot_admin_dot_v2_dot_common__pb2 DESCRIPTOR = _descriptor.FileDescriptor( diff --git a/gcloud/bigtable/_generated/operations_grpc_pb2.py b/google/cloud/bigtable/_generated/operations_grpc_pb2.py similarity index 100% rename from gcloud/bigtable/_generated/operations_grpc_pb2.py rename to google/cloud/bigtable/_generated/operations_grpc_pb2.py diff --git a/gcloud/bigtable/_generated/table_pb2.py b/google/cloud/bigtable/_generated/table_pb2.py similarity index 100% rename from gcloud/bigtable/_generated/table_pb2.py rename to google/cloud/bigtable/_generated/table_pb2.py diff --git a/gcloud/bigtable/client.py b/google/cloud/bigtable/client.py similarity index 92% rename from gcloud/bigtable/client.py rename to google/cloud/bigtable/client.py index de124f489c63..1a5a05336084 100644 --- a/gcloud/bigtable/client.py +++ b/google/cloud/bigtable/client.py @@ -19,27 +19,27 @@ In the hierarchy of API concepts * a :class:`Client` owns an :class:`.Instance` -* a :class:`.Instance` owns a :class:`Table ` -* a :class:`Table ` owns a - :class:`ColumnFamily <.column_family.ColumnFamily>` -* a :class:`Table ` owns a :class:`Row <.row.Row>` +* a :class:`.Instance` owns a :class:`~google.cloud.bigtable.table.Table` +* a :class:`~google.cloud.bigtable.table.Table` owns a + :class:`~.column_family.ColumnFamily` +* a :class:`~google.cloud.bigtable.table.Table` owns a :class:`~.row.Row` (and all the cells in the row) """ from pkg_resources import get_distribution -from gcloud._helpers import make_stub -from gcloud.bigtable._generated import bigtable_instance_admin_pb2 -from gcloud.bigtable._generated import bigtable_pb2 -from gcloud.bigtable._generated import bigtable_table_admin_pb2 -from gcloud.bigtable._generated import operations_grpc_pb2 -from gcloud.bigtable.cluster import DEFAULT_SERVE_NODES -from gcloud.bigtable.instance import Instance -from gcloud.bigtable.instance import _EXISTING_INSTANCE_LOCATION_ID -from gcloud.client import _ClientFactoryMixin -from gcloud.client import _ClientProjectMixin -from gcloud.credentials import get_credentials +from google.cloud._helpers import make_stub +from google.cloud.bigtable._generated import bigtable_instance_admin_pb2 +from google.cloud.bigtable._generated import bigtable_pb2 +from google.cloud.bigtable._generated import bigtable_table_admin_pb2 +from google.cloud.bigtable._generated import operations_grpc_pb2 +from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES +from google.cloud.bigtable.instance import Instance +from google.cloud.bigtable.instance import _EXISTING_INSTANCE_LOCATION_ID +from google.cloud.client import _ClientFactoryMixin +from google.cloud.client import _ClientProjectMixin +from google.cloud.credentials import get_credentials TABLE_ADMIN_HOST = 'bigtableadmin.googleapis.com' @@ -67,8 +67,8 @@ READ_ONLY_SCOPE = 'https://www.googleapis.com/auth/bigtable.data.readonly' """Scope for reading table data.""" -DEFAULT_USER_AGENT = 'gcloud-python/{0}'.format( - get_distribution('gcloud').version) +DEFAULT_USER_AGENT = 'google-cloud-python/{0}'.format( + get_distribution('google-cloud').version) """The default user agent for API requests.""" diff --git a/gcloud/bigtable/cluster.py b/google/cloud/bigtable/cluster.py similarity index 97% rename from gcloud/bigtable/cluster.py rename to google/cloud/bigtable/cluster.py index 3684b6328378..f89e80ea6832 100644 --- a/gcloud/bigtable/cluster.py +++ b/google/cloud/bigtable/cluster.py @@ -17,13 +17,13 @@ import re -from gcloud.bigtable._generated import ( +from google.cloud.bigtable._generated import ( instance_pb2 as data_v2_pb2) -from gcloud.bigtable._generated import ( +from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb2) -from gcloud.operation import Operation -from gcloud.operation import _compute_type_url -from gcloud.operation import _register_type_url +from google.cloud.operation import Operation +from google.cloud.operation import _compute_type_url +from google.cloud.operation import _register_type_url _CLUSTER_NAME_RE = re.compile(r'^projects/(?P[^/]+)/' diff --git a/gcloud/bigtable/column_family.py b/google/cloud/bigtable/column_family.py similarity index 98% rename from gcloud/bigtable/column_family.py rename to google/cloud/bigtable/column_family.py index 682375c8dcfd..edc5499f3f12 100644 --- a/gcloud/bigtable/column_family.py +++ b/google/cloud/bigtable/column_family.py @@ -19,9 +19,9 @@ from google.protobuf import duration_pb2 -from gcloud.bigtable._generated import ( +from google.cloud.bigtable._generated import ( table_pb2 as table_v2_pb2) -from gcloud.bigtable._generated import ( +from google.cloud.bigtable._generated import ( bigtable_table_admin_pb2 as table_admin_v2_pb2) @@ -206,7 +206,7 @@ class ColumnFamily(object): :param column_family_id: The ID of the column family. Must be of the form ``[_a-zA-Z0-9][-_.a-zA-Z0-9]*``. - :type table: :class:`Table ` + :type table: :class:`Table ` :param table: The table that owns the column family. :type gc_rule: :class:`GarbageCollectionRule` diff --git a/gcloud/bigtable/instance.py b/google/cloud/bigtable/instance.py similarity index 94% rename from gcloud/bigtable/instance.py rename to google/cloud/bigtable/instance.py index c84c014f7dfd..ad7e5ef99c23 100644 --- a/gcloud/bigtable/instance.py +++ b/google/cloud/bigtable/instance.py @@ -17,18 +17,18 @@ import re -from gcloud.bigtable._generated import ( +from google.cloud.bigtable._generated import ( instance_pb2 as data_v2_pb2) -from gcloud.bigtable._generated import ( +from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb2) -from gcloud.bigtable._generated import ( +from google.cloud.bigtable._generated import ( bigtable_table_admin_pb2 as table_messages_v2_pb2) -from gcloud.bigtable.cluster import Cluster -from gcloud.bigtable.cluster import DEFAULT_SERVE_NODES -from gcloud.bigtable.table import Table -from gcloud.operation import Operation -from gcloud.operation import _compute_type_url -from gcloud.operation import _register_type_url +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 _compute_type_url +from google.cloud.operation import _register_type_url _EXISTING_INSTANCE_LOCATION_ID = 'see-existing-cluster' @@ -85,7 +85,7 @@ class Instance(object): :type instance_id: str :param instance_id: The ID of the instance. - :type client: :class:`Client ` + :type client: :class:`Client ` :param client: The client that owns the instance. Provides authorization and a project ID. @@ -131,7 +131,7 @@ def from_pb(cls, instance_pb, client): :type instance_pb: :class:`instance_pb2.Instance` :param instance_pb: A instance protobuf object. - :type client: :class:`Client ` + :type client: :class:`Client ` :param client: The client that owns the instance. :rtype: :class:`Instance` @@ -327,7 +327,7 @@ def table(self, table_id): :type table_id: str :param table_id: The ID of the table. - :rtype: :class:`Table ` + :rtype: :class:`Table ` :returns: The table owned by this instance. """ return Table(table_id, self) @@ -335,7 +335,7 @@ def table(self, table_id): def list_tables(self): """List the tables in this instance. - :rtype: list of :class:`Table ` + :rtype: list of :class:`Table ` :returns: The list of tables owned by the instance. :raises: :class:`ValueError ` if one of the returned tables has a name that is not of the expected format. diff --git a/gcloud/bigtable/row.py b/google/cloud/bigtable/row.py similarity index 98% rename from gcloud/bigtable/row.py rename to google/cloud/bigtable/row.py index e7a1b7bc491d..11ebceeafb94 100644 --- a/gcloud/bigtable/row.py +++ b/google/cloud/bigtable/row.py @@ -19,12 +19,12 @@ import six -from gcloud._helpers import _datetime_from_microseconds -from gcloud._helpers import _microseconds_from_datetime -from gcloud._helpers import _to_bytes -from gcloud.bigtable._generated import ( +from google.cloud._helpers import _datetime_from_microseconds +from google.cloud._helpers import _microseconds_from_datetime +from google.cloud._helpers import _to_bytes +from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) -from gcloud.bigtable._generated import ( +from google.cloud.bigtable._generated import ( bigtable_pb2 as messages_v2_pb2) @@ -47,7 +47,7 @@ class Row(object): :type row_key: bytes :param row_key: The key for the current row. - :type table: :class:`Table ` + :type table: :class:`Table ` :param table: The table that owns the row. """ @@ -69,7 +69,7 @@ class _SetDeleteRow(Row): :type row_key: bytes :param row_key: The key for the current row. - :type table: :class:`Table ` + :type table: :class:`Table ` :param table: The table that owns the row. """ @@ -244,7 +244,7 @@ class DirectRow(_SetDeleteRow): :type row_key: bytes :param row_key: The key for the current row. - :type table: :class:`Table ` + :type table: :class:`Table ` :param table: The table that owns the row. """ @@ -434,7 +434,7 @@ class ConditionalRow(_SetDeleteRow): :type row_key: bytes :param row_key: The key for the current row. - :type table: :class:`Table ` + :type table: :class:`Table ` :param table: The table that owns the row. :type filter_: :class:`.RowFilter` @@ -662,7 +662,7 @@ class AppendRow(Row): :type row_key: bytes :param row_key: The key for the current row. - :type table: :class:`Table ` + :type table: :class:`Table ` :param table: The table that owns the row. """ diff --git a/gcloud/bigtable/row_data.py b/google/cloud/bigtable/row_data.py similarity index 99% rename from gcloud/bigtable/row_data.py rename to google/cloud/bigtable/row_data.py index e6b77508b4a7..add93113f6ad 100644 --- a/gcloud/bigtable/row_data.py +++ b/google/cloud/bigtable/row_data.py @@ -18,8 +18,8 @@ import copy import six -from gcloud._helpers import _datetime_from_microseconds -from gcloud._helpers import _to_bytes +from google.cloud._helpers import _datetime_from_microseconds +from google.cloud._helpers import _to_bytes class Cell(object): diff --git a/gcloud/bigtable/row_filters.py b/google/cloud/bigtable/row_filters.py similarity index 99% rename from gcloud/bigtable/row_filters.py rename to google/cloud/bigtable/row_filters.py index 07afb45d3ed4..86a5957a3699 100644 --- a/gcloud/bigtable/row_filters.py +++ b/google/cloud/bigtable/row_filters.py @@ -15,9 +15,9 @@ """Filters for Google Cloud Bigtable Row classes.""" -from gcloud._helpers import _microseconds_from_datetime -from gcloud._helpers import _to_bytes -from gcloud.bigtable._generated import ( +from google.cloud._helpers import _microseconds_from_datetime +from google.cloud._helpers import _to_bytes +from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) diff --git a/gcloud/bigtable/table.py b/google/cloud/bigtable/table.py similarity index 96% rename from gcloud/bigtable/table.py rename to google/cloud/bigtable/table.py index b0e1d73d07fe..665491d7d0a7 100644 --- a/gcloud/bigtable/table.py +++ b/google/cloud/bigtable/table.py @@ -14,19 +14,19 @@ """User friendly container for Google Cloud Bigtable Table.""" -from gcloud._helpers import _to_bytes -from gcloud.bigtable._generated import ( +from google.cloud._helpers import _to_bytes +from google.cloud.bigtable._generated import ( bigtable_pb2 as data_messages_v2_pb2) -from gcloud.bigtable._generated import ( +from google.cloud.bigtable._generated import ( bigtable_table_admin_pb2 as table_admin_messages_v2_pb2) -from gcloud.bigtable._generated import ( +from google.cloud.bigtable._generated import ( table_pb2 as table_v2_pb2) -from gcloud.bigtable.column_family import _gc_rule_from_pb -from gcloud.bigtable.column_family import ColumnFamily -from gcloud.bigtable.row import AppendRow -from gcloud.bigtable.row import ConditionalRow -from gcloud.bigtable.row import DirectRow -from gcloud.bigtable.row_data import PartialRowsData +from google.cloud.bigtable.column_family import _gc_rule_from_pb +from google.cloud.bigtable.column_family import ColumnFamily +from google.cloud.bigtable.row import AppendRow +from google.cloud.bigtable.row import ConditionalRow +from google.cloud.bigtable.row import DirectRow +from google.cloud.bigtable.row_data import PartialRowsData class Table(object): diff --git a/gcloud/client.py b/google/cloud/client.py similarity index 96% rename from gcloud/client.py rename to google/cloud/client.py index a3bc021c411d..fadb00a22e13 100644 --- a/gcloud/client.py +++ b/google/cloud/client.py @@ -17,9 +17,9 @@ from oauth2client.service_account import ServiceAccountCredentials import six -from gcloud._helpers import _determine_default_project -from gcloud.connection import Connection -from gcloud.credentials import get_credentials +from google.cloud._helpers import _determine_default_project +from google.cloud.connection import Connection +from google.cloud.credentials import get_credentials class _ClientFactoryMixin(object): @@ -48,7 +48,7 @@ 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:`gcloud.pubsub.client.Client` + :rtype: :class:`google.cloud.pubsub.client.Client` :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. @@ -83,7 +83,7 @@ def from_service_account_p12(cls, client_email, private_key_path, :type kwargs: dict :param kwargs: Remaining keyword arguments to pass to constructor. - :rtype: :class:`gcloud.client.Client` + :rtype: :class:`google.cloud.client.Client` :returns: The client created with the retrieved P12 credentials. :raises: :class:`TypeError` if there is a conflict with the kwargs and the credentials created by the factory. diff --git a/gcloud/connection.py b/google/cloud/connection.py similarity index 98% rename from gcloud/connection.py rename to google/cloud/connection.py index 1a96086a35a6..1ad272ec7f71 100644 --- a/gcloud/connection.py +++ b/google/cloud/connection.py @@ -21,7 +21,7 @@ import httplib2 -from gcloud.exceptions import make_exception +from google.cloud.exceptions import make_exception API_BASE_URL = 'https://www.googleapis.com' @@ -63,8 +63,9 @@ class Connection(object): :param http: An optional HTTP object to make requests. """ - USER_AGENT = "gcloud-python/{0}".format(get_distribution('gcloud').version) - """The user agent for gcloud-python requests.""" + USER_AGENT = "google-cloud-python/{0}".format( + get_distribution('google-cloud').version) + """The user agent for google-cloud-python requests.""" SCOPE = None """The scopes required for authenticating with a service. @@ -310,7 +311,7 @@ def api_request(self, method, path, query_params=None, you shouldn't provide this and instead use the default for the library. Default is the latest API version supported by - gcloud-python. + google-cloud-python. :type expect_json: bool :param expect_json: If True, this method will try to parse the diff --git a/gcloud/credentials.py b/google/cloud/credentials.py similarity index 94% rename from gcloud/credentials.py rename to google/cloud/credentials.py index e6d78b9cb375..4861d43e3072 100644 --- a/gcloud/credentials.py +++ b/google/cloud/credentials.py @@ -21,9 +21,9 @@ from oauth2client import client -from gcloud._helpers import UTC -from gcloud._helpers import _NOW -from gcloud._helpers import _microseconds_from_datetime +from google.cloud._helpers import UTC +from google.cloud._helpers import _NOW +from google.cloud._helpers import _microseconds_from_datetime def get_credentials(): @@ -102,12 +102,12 @@ def _get_signed_query_params(credentials, expiration, string_to_sign): signed payload. """ if not hasattr(credentials, 'sign_blob'): + auth_uri = ('http://gcloud-python.readthedocs.io/en/latest/' + 'gcloud-auth.html#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 https://googlecloud' - 'platform.github.io/gcloud-python/stable/gcloud-' - 'auth.html#setting-up-a-service-account for more ' - 'details.' % type(credentials)) + 'just contains a token. see %s for more ' + 'details.' % (type(credentials), auth_uri)) _, signature_bytes = credentials.sign_blob(string_to_sign) signature = base64.b64encode(signature_bytes) @@ -172,7 +172,7 @@ def generate_signed_url(credentials, resource, expiration, See headers `reference`_ for more details on optional arguments. .. _Issue 922: https://github.com/GoogleCloudPlatform/\ - gcloud-python/issues/922 + google-cloud-python/issues/922 .. _reference: https://cloud.google.com/storage/docs/reference-headers :type credentials: :class:`oauth2client.appengine.AppAssertionCredentials` diff --git a/gcloud/datastore/__init__.py b/google/cloud/datastore/__init__.py similarity index 70% rename from gcloud/datastore/__init__.py rename to google/cloud/datastore/__init__.py index 8420de90d5d0..103131d4c899 100644 --- a/gcloud/datastore/__init__.py +++ b/google/cloud/datastore/__init__.py @@ -16,7 +16,7 @@ You'll typically use these to get started with the API:: - >>> from gcloud import datastore + >>> from google.cloud import datastore >>> >>> client = datastore.Client() >>> key = client.key('EntityKind', 1234) @@ -25,38 +25,39 @@ The main concepts with this API are: -- :class:`gcloud.datastore.connection.Connection` +- :class:`google.cloud.datastore.connection.Connection` which represents a connection between your machine and the Cloud Datastore API. -- :class:`gcloud.datastore.client.Client` +- :class:`google.cloud.datastore.client.Client` which represents a project (string) and namespace (string) bundled with a connection and has convenience methods for constructing objects with that project / namespace. -- :class:`gcloud.datastore.entity.Entity` +- :class:`google.cloud.datastore.entity.Entity` which represents a single entity in the datastore (akin to a row in relational database world). -- :class:`gcloud.datastore.key.Key` +- :class:`google.cloud.datastore.key.Key` which represents a pointer to a particular entity in the datastore (akin to a unique identifier in relational database world). -- :class:`gcloud.datastore.query.Query` +- :class:`google.cloud.datastore.query.Query` which represents a lookup or search over the rows in the datastore. -- :class:`gcloud.datastore.transaction.Transaction` +- :class:`google.cloud.datastore.transaction.Transaction` which represents an all-or-none transaction and enables consistency when race conditions may occur. """ -from gcloud.datastore.batch import Batch -from gcloud.datastore.connection import Connection -from gcloud.datastore.client import Client -from gcloud.datastore.entity import Entity -from gcloud.datastore.key import Key -from gcloud.datastore.query import Query -from gcloud.datastore.transaction import Transaction + +from google.cloud.datastore.batch import Batch +from google.cloud.datastore.connection import Connection +from google.cloud.datastore.client import Client +from google.cloud.datastore.entity import Entity +from google.cloud.datastore.key import Key +from google.cloud.datastore.query import Query +from google.cloud.datastore.transaction import Transaction SCOPE = Connection.SCOPE diff --git a/gcloud/datastore/_generated/__init__.py b/google/cloud/datastore/_generated/__init__.py similarity index 100% rename from gcloud/datastore/_generated/__init__.py rename to google/cloud/datastore/_generated/__init__.py diff --git a/gcloud/datastore/_generated/_datastore.proto b/google/cloud/datastore/_generated/_datastore.proto similarity index 100% rename from gcloud/datastore/_generated/_datastore.proto rename to google/cloud/datastore/_generated/_datastore.proto diff --git a/gcloud/datastore/_generated/_entity.proto b/google/cloud/datastore/_generated/_entity.proto similarity index 100% rename from gcloud/datastore/_generated/_entity.proto rename to google/cloud/datastore/_generated/_entity.proto diff --git a/gcloud/datastore/_generated/_query.proto b/google/cloud/datastore/_generated/_query.proto similarity index 100% rename from gcloud/datastore/_generated/_query.proto rename to google/cloud/datastore/_generated/_query.proto diff --git a/gcloud/datastore/_generated/datastore_grpc_pb2.py b/google/cloud/datastore/_generated/datastore_grpc_pb2.py similarity index 91% rename from gcloud/datastore/_generated/datastore_grpc_pb2.py rename to google/cloud/datastore/_generated/datastore_grpc_pb2.py index 639c42c6ce6b..beea35710c6c 100644 --- a/gcloud/datastore/_generated/datastore_grpc_pb2.py +++ b/google/cloud/datastore/_generated/datastore_grpc_pb2.py @@ -1,19 +1,19 @@ # BEGIN: Imports from datastore_pb2 -from gcloud.datastore._generated.datastore_pb2 import AllocateIdsRequest -from gcloud.datastore._generated.datastore_pb2 import AllocateIdsResponse -from gcloud.datastore._generated.datastore_pb2 import BeginTransactionRequest -from gcloud.datastore._generated.datastore_pb2 import BeginTransactionResponse -from gcloud.datastore._generated.datastore_pb2 import CommitRequest -from gcloud.datastore._generated.datastore_pb2 import CommitResponse -from gcloud.datastore._generated.datastore_pb2 import LookupRequest -from gcloud.datastore._generated.datastore_pb2 import LookupResponse -from gcloud.datastore._generated.datastore_pb2 import Mutation -from gcloud.datastore._generated.datastore_pb2 import MutationResult -from gcloud.datastore._generated.datastore_pb2 import ReadOptions -from gcloud.datastore._generated.datastore_pb2 import RollbackRequest -from gcloud.datastore._generated.datastore_pb2 import RollbackResponse -from gcloud.datastore._generated.datastore_pb2 import RunQueryRequest -from gcloud.datastore._generated.datastore_pb2 import RunQueryResponse +from google.cloud.datastore._generated.datastore_pb2 import AllocateIdsRequest +from google.cloud.datastore._generated.datastore_pb2 import AllocateIdsResponse +from google.cloud.datastore._generated.datastore_pb2 import BeginTransactionRequest +from google.cloud.datastore._generated.datastore_pb2 import BeginTransactionResponse +from google.cloud.datastore._generated.datastore_pb2 import CommitRequest +from google.cloud.datastore._generated.datastore_pb2 import CommitResponse +from google.cloud.datastore._generated.datastore_pb2 import LookupRequest +from google.cloud.datastore._generated.datastore_pb2 import LookupResponse +from google.cloud.datastore._generated.datastore_pb2 import Mutation +from google.cloud.datastore._generated.datastore_pb2 import MutationResult +from google.cloud.datastore._generated.datastore_pb2 import ReadOptions +from google.cloud.datastore._generated.datastore_pb2 import RollbackRequest +from google.cloud.datastore._generated.datastore_pb2 import RollbackResponse +from google.cloud.datastore._generated.datastore_pb2 import RunQueryRequest +from google.cloud.datastore._generated.datastore_pb2 import RunQueryResponse # END: Imports from datastore_pb2 import grpc from grpc.beta import implementations as beta_implementations diff --git a/gcloud/datastore/_generated/datastore_pb2.py b/google/cloud/datastore/_generated/datastore_pb2.py similarity index 99% rename from gcloud/datastore/_generated/datastore_pb2.py rename to google/cloud/datastore/_generated/datastore_pb2.py index ff61f1995e6b..f7a321a5c6b8 100644 --- a/gcloud/datastore/_generated/datastore_pb2.py +++ b/google/cloud/datastore/_generated/datastore_pb2.py @@ -14,8 +14,8 @@ from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 -from gcloud.datastore._generated import entity_pb2 as google_dot_datastore_dot_v1_dot_entity__pb2 -from gcloud.datastore._generated import query_pb2 as google_dot_datastore_dot_v1_dot_query__pb2 +from google.cloud.datastore._generated import entity_pb2 as google_dot_datastore_dot_v1_dot_entity__pb2 +from google.cloud.datastore._generated import query_pb2 as google_dot_datastore_dot_v1_dot_query__pb2 DESCRIPTOR = _descriptor.FileDescriptor( diff --git a/gcloud/datastore/_generated/entity_pb2.py b/google/cloud/datastore/_generated/entity_pb2.py similarity index 100% rename from gcloud/datastore/_generated/entity_pb2.py rename to google/cloud/datastore/_generated/entity_pb2.py diff --git a/gcloud/datastore/_generated/query_pb2.py b/google/cloud/datastore/_generated/query_pb2.py similarity index 99% rename from gcloud/datastore/_generated/query_pb2.py rename to google/cloud/datastore/_generated/query_pb2.py index 2c611c071327..7569f225d53a 100644 --- a/gcloud/datastore/_generated/query_pb2.py +++ b/google/cloud/datastore/_generated/query_pb2.py @@ -14,7 +14,7 @@ from google.api import annotations_pb2 as google_dot_api_dot_annotations__pb2 -from gcloud.datastore._generated import entity_pb2 as google_dot_datastore_dot_v1_dot_entity__pb2 +from google.cloud.datastore._generated import entity_pb2 as google_dot_datastore_dot_v1_dot_entity__pb2 from google.protobuf import wrappers_pb2 as google_dot_protobuf_dot_wrappers__pb2 from google.type import latlng_pb2 as google_dot_type_dot_latlng__pb2 diff --git a/gcloud/datastore/batch.py b/google/cloud/datastore/batch.py similarity index 91% rename from gcloud/datastore/batch.py rename to google/cloud/datastore/batch.py index 141bb54bc247..756c3de5bd33 100644 --- a/gcloud/datastore/batch.py +++ b/google/cloud/datastore/batch.py @@ -21,8 +21,8 @@ https://cloud.google.com/datastore/docs/concepts/entities#Datastore_Batch_operations """ -from gcloud.datastore import helpers -from gcloud.datastore._generated import datastore_pb2 as _datastore_pb2 +from google.cloud.datastore import helpers +from google.cloud.datastore._generated import datastore_pb2 as _datastore_pb2 class Batch(object): @@ -34,7 +34,7 @@ class Batch(object): operations and the ``delete`` operation into the same mutation, and send them to the server in a single API request:: - >>> from gcloud import datastore + >>> from google.cloud import datastore >>> client = datastore.Client() >>> batch = client.batch() >>> batch.put(entity1) @@ -57,7 +57,7 @@ class Batch(object): ... do_some_work(batch) ... raise Exception() # rolls back - :type client: :class:`gcloud.datastore.client.Client` + :type client: :class:`google.cloud.datastore.client.Client` :param client: The client used to connect to datastore. """ @@ -107,7 +107,7 @@ def namespace(self): def connection(self): """Getter for connection over which the batch will run. - :rtype: :class:`gcloud.datastore.connection.Connection` + :rtype: :class:`google.cloud.datastore.connection.Connection` :returns: The connection over which the batch will run. """ return self._client.connection @@ -115,7 +115,7 @@ def connection(self): def _add_partial_key_entity_pb(self): """Adds a new mutation for an entity with a partial key. - :rtype: :class:`gcloud.datastore._generated.entity_pb2.Entity` + :rtype: :class:`google.cloud.datastore._generated.entity_pb2.Entity` :returns: The newly created entity protobuf that will be updated and sent with a commit. """ @@ -125,7 +125,7 @@ def _add_partial_key_entity_pb(self): def _add_complete_key_entity_pb(self): """Adds a new mutation for an entity with a completed key. - :rtype: :class:`gcloud.datastore._generated.entity_pb2.Entity` + :rtype: :class:`google.cloud.datastore._generated.entity_pb2.Entity` :returns: The newly created entity protobuf that will be updated and sent with a commit. """ @@ -138,7 +138,7 @@ def _add_complete_key_entity_pb(self): def _add_delete_key_pb(self): """Adds a new mutation for a key to be deleted. - :rtype: :class:`gcloud.datastore._generated.entity_pb2.Key` + :rtype: :class:`google.cloud.datastore._generated.entity_pb2.Key` :returns: The newly created key protobuf that will be deleted when sent with a commit. """ @@ -180,7 +180,7 @@ def put(self, entity): the key for the ``entity`` passed in is updated to match the key ID assigned by the server. - :type entity: :class:`gcloud.datastore.entity.Entity` + :type entity: :class:`google.cloud.datastore.entity.Entity` :param entity: the entity to be saved. :raises: ValueError if entity has no key assigned, or if the key's @@ -203,7 +203,7 @@ def put(self, entity): def delete(self, key): """Remember a key to be deleted during :meth:`commit`. - :type key: :class:`gcloud.datastore.key.Key` + :type key: :class:`google.cloud.datastore.key.Key` :param key: the key to be deleted. :raises: ValueError if key is not complete, or if the key's @@ -225,7 +225,7 @@ def begin(self): statement, however it can be called explicitly if you don't want to use a context manager. - Overridden by :class:`gcloud.datastore.transaction.Transaction`. + Overridden by :class:`google.cloud.datastore.transaction.Transaction`. :raises: :class:`ValueError` if the batch has already begun. """ @@ -266,7 +266,7 @@ def rollback(self): Marks the batch as aborted (can't be used again). - Overridden by :class:`gcloud.datastore.transaction.Transaction`. + Overridden by :class:`google.cloud.datastore.transaction.Transaction`. """ self._status = self._ABORTED @@ -290,10 +290,10 @@ def _assign_entity_to_pb(entity_pb, entity): Helper method for ``Batch.put``. - :type entity_pb: :class:`gcloud.datastore._generated.entity_pb2.Entity` + :type entity_pb: :class:`.datastore._generated.entity_pb2.Entity` :param entity_pb: The entity owned by a mutation. - :type entity: :class:`gcloud.datastore.entity.Entity` + :type entity: :class:`google.cloud.datastore.entity.Entity` :param entity: The entity being updated within the batch / transaction. """ bare_entity_pb = helpers.entity_to_protobuf(entity) diff --git a/gcloud/datastore/client.py b/google/cloud/datastore/client.py similarity index 84% rename from gcloud/datastore/client.py rename to google/cloud/datastore/client.py index 2293ef46a5e6..f919666017f2 100644 --- a/gcloud/datastore/client.py +++ b/google/cloud/datastore/client.py @@ -15,18 +15,19 @@ import os -from gcloud._helpers import _LocalStack -from gcloud._helpers import _determine_default_project as _base_default_project -from gcloud.client import _ClientProjectMixin -from gcloud.client import Client as _BaseClient -from gcloud.datastore import helpers -from gcloud.datastore.connection import Connection -from gcloud.datastore.batch import Batch -from gcloud.datastore.entity import Entity -from gcloud.datastore.key import Key -from gcloud.datastore.query import Query -from gcloud.datastore.transaction import Transaction -from gcloud.environment_vars import GCD_DATASET +from google.cloud._helpers import _LocalStack +from google.cloud._helpers import ( + _determine_default_project as _base_default_project) +from google.cloud.client import _ClientProjectMixin +from google.cloud.client import Client as _BaseClient +from google.cloud.datastore import helpers +from google.cloud.datastore.connection import Connection +from google.cloud.datastore.batch import Batch +from google.cloud.datastore.entity import Entity +from google.cloud.datastore.key import Key +from google.cloud.datastore.query import Query +from google.cloud.datastore.transaction import Transaction +from google.cloud.environment_vars import GCD_DATASET _MAX_LOOPS = 128 @@ -45,7 +46,7 @@ def _determine_default_project(project=None): implicit environments are: * DATASTORE_DATASET environment variable (for ``gcd`` / emulator testing) - * GCLOUD_PROJECT environment variable + * GOOGLE_CLOUD_PROJECT environment variable * Google App Engine application ID * Google Compute Engine project ID (from metadata server) @@ -71,13 +72,13 @@ def _extended_lookup(connection, project, key_pbs, Helper function for :meth:`Client.get_multi`. - :type connection: :class:`gcloud.datastore.connection.Connection` + :type connection: :class:`google.cloud.datastore.connection.Connection` :param connection: The connection used to connect to datastore. :type project: string :param project: The project to make the request for. - :type key_pbs: list of :class:`gcloud.datastore._generated.entity_pb2.Key` + :type key_pbs: list of :class:`.datastore._generated.entity_pb2.Key` :param key_pbs: The keys to retrieve from the datastore. :type missing: list @@ -99,7 +100,7 @@ def _extended_lookup(connection, project, key_pbs, the given transaction. Incompatible with ``eventual==True``. - :rtype: list of :class:`gcloud.datastore._generated.entity_pb2.Entity` + :rtype: list of :class:`.datastore._generated.entity_pb2.Entity` :returns: The requested entities. :raises: :class:`ValueError` if missing / deferred are not null or empty list. @@ -182,7 +183,7 @@ def _push_batch(self, batch): "Protected", intended for use by batch / transaction context mgrs. - :type batch: :class:`gcloud.datastore.batch.Batch`, or an object + :type batch: :class:`google.cloud.datastore.batch.Batch`, or an object implementing its API. :param batch: newly-active batch/transaction. """ @@ -194,7 +195,7 @@ def _pop_batch(self): "Protected", intended for use by batch / transaction context mgrs. :raises: IndexError if the stack is empty. - :rtype: :class:`gcloud.datastore.batch.Batch`, or an object + :rtype: :class:`google.cloud.datastore.batch.Batch`, or an object implementing its API. :returns: the top-most batch/transaction, after removing it. """ @@ -204,7 +205,7 @@ def _pop_batch(self): def current_batch(self): """Currently-active batch. - :rtype: :class:`gcloud.datastore.batch.Batch`, or an object + :rtype: :class:`google.cloud.datastore.batch.Batch`, or an object implementing its API, or ``NoneType`` (if no batch is active). :returns: The batch/transaction at the top of the batch stack. """ @@ -214,9 +215,9 @@ def current_batch(self): def current_transaction(self): """Currently-active transaction. - :rtype: :class:`gcloud.datastore.transaction.Transaction`, or an object - implementing its API, or ``NoneType`` (if no transaction is - active). + :rtype: :class:`google.cloud.datastore.transaction.Transaction`, or an + object implementing its API, or ``NoneType`` (if no transaction + is active). :returns: The transaction at the top of the batch stack. """ transaction = self.current_batch @@ -232,7 +233,7 @@ def get(self, key, missing=None, deferred=None, transaction=None): The backend API does not make a distinction between a single key or multiple keys in a lookup request. - :type key: :class:`gcloud.datastore.key.Key` + :type key: :class:`google.cloud.datastore.key.Key` :param key: The key to be retrieved from the datastore. :type missing: list @@ -244,11 +245,11 @@ def get(self, key, missing=None, deferred=None, transaction=None): :param deferred: (Optional) If a list is passed, the keys returned by the backend as "deferred" will be copied into it. - :type transaction: :class:`gcloud.datastore.transaction.Transaction` + :type transaction: :class:`~.datastore.transaction.Transaction` :param transaction: (Optional) Transaction to use for read consistency. If not passed, uses current transaction, if set. - :rtype: :class:`gcloud.datastore.entity.Entity` or ``NoneType`` + :rtype: :class:`google.cloud.datastore.entity.Entity` or ``NoneType`` :returns: The requested entity if it exists. """ entities = self.get_multi(keys=[key], missing=missing, @@ -259,7 +260,7 @@ def get(self, key, missing=None, deferred=None, transaction=None): def get_multi(self, keys, missing=None, deferred=None, transaction=None): """Retrieve entities, along with their attributes. - :type keys: list of :class:`gcloud.datastore.key.Key` + :type keys: list of :class:`google.cloud.datastore.key.Key` :param keys: The keys to be retrieved from the datastore. :type missing: list @@ -272,11 +273,11 @@ def get_multi(self, keys, missing=None, deferred=None, transaction=None): by the backend as "deferred" will be copied into it. If the list is not empty, an error will occur. - :type transaction: :class:`gcloud.datastore.transaction.Transaction` + :type transaction: :class:`~.datastore.transaction.Transaction` :param transaction: (Optional) Transaction to use for read consistency. If not passed, uses current transaction, if set. - :rtype: list of :class:`gcloud.datastore.entity.Entity` + :rtype: list of :class:`google.cloud.datastore.entity.Entity` :returns: The requested entities. :raises: :class:`ValueError` if one or more of ``keys`` has a project which does not match our project. @@ -323,7 +324,7 @@ def put(self, entity): The backend API does not make a distinction between a single entity or multiple entities in a commit request. - :type entity: :class:`gcloud.datastore.entity.Entity` + :type entity: :class:`google.cloud.datastore.entity.Entity` :param entity: The entity to be saved to the datastore. """ self.put_multi(entities=[entity]) @@ -331,7 +332,7 @@ def put(self, entity): def put_multi(self, entities): """Save entities in the Cloud Datastore. - :type entities: list of :class:`gcloud.datastore.entity.Entity` + :type entities: list of :class:`google.cloud.datastore.entity.Entity` :param entities: The entities to be saved to the datastore. :raises: :class:`ValueError` if ``entities`` is a single entity. @@ -363,7 +364,7 @@ def delete(self, key): The backend API does not make a distinction between a single key or multiple keys in a commit request. - :type key: :class:`gcloud.datastore.key.Key` + :type key: :class:`google.cloud.datastore.key.Key` :param key: The key to be deleted from the datastore. """ self.delete_multi(keys=[key]) @@ -371,7 +372,7 @@ def delete(self, key): def delete_multi(self, keys): """Delete keys from the Cloud Datastore. - :type keys: list of :class:`gcloud.datastore.key.Key` + :type keys: list of :class:`google.cloud.datastore.key.Key` :param keys: The keys to be deleted from the Datastore. """ if not keys: @@ -393,13 +394,13 @@ def delete_multi(self, keys): def allocate_ids(self, incomplete_key, num_ids): """Allocate a list of IDs from a partial key. - :type incomplete_key: :class:`gcloud.datastore.key.Key` + :type incomplete_key: :class:`google.cloud.datastore.key.Key` :param incomplete_key: Partial key to use as base for allocated IDs. :type num_ids: int :param num_ids: The number of IDs to allocate. - :rtype: list of :class:`gcloud.datastore.key.Key` + :rtype: list of :class:`google.cloud.datastore.key.Key` :returns: The (complete) keys allocated with ``incomplete_key`` as root. :raises: :class:`ValueError` if ``incomplete_key`` is not a @@ -420,7 +421,7 @@ def allocate_ids(self, incomplete_key, num_ids): for allocated_id in allocated_ids] def key(self, *path_args, **kwargs): - """Proxy to :class:`gcloud.datastore.key.Key`. + """Proxy to :class:`google.cloud.datastore.key.Key`. Passes our ``project``. """ @@ -432,27 +433,27 @@ def key(self, *path_args, **kwargs): return Key(*path_args, **kwargs) def batch(self): - """Proxy to :class:`gcloud.datastore.batch.Batch`.""" + """Proxy to :class:`google.cloud.datastore.batch.Batch`.""" return Batch(self) def transaction(self): - """Proxy to :class:`gcloud.datastore.transaction.Transaction`.""" + """Proxy to :class:`google.cloud.datastore.transaction.Transaction`.""" return Transaction(self) def query(self, **kwargs): - """Proxy to :class:`gcloud.datastore.query.Query`. + """Proxy to :class:`google.cloud.datastore.query.Query`. Passes our ``project``. Using query to search a datastore:: - >>> from gcloud import datastore + >>> from google.cloud import datastore >>> client = datastore.Client() >>> query = client.query(kind='MyKind') >>> query.add_filter('property', '=', 'val') Using the query iterator's - :meth:`next_page() ` method: + :meth:`~google.cloud.datastore.query.Iterator.next_page` method: >>> query_iter = query.fetch() >>> entities, more_results, cursor = query_iter.next_page() @@ -470,10 +471,10 @@ def query(self, **kwargs): :type kwargs: dict :param kwargs: Parameters for initializing and instance of - :class:`gcloud.datastore.query.Query`. + :class:`google.cloud.datastore.query.Query`. - :rtype: :class:`gcloud.datastore.query.Query` - :returns: An instance of :class:`gcloud.datastore.query.Query` + :rtype: :class:`google.cloud.datastore.query.Query` + :returns: An instance of :class:`google.cloud.datastore.query.Query` """ if 'client' in kwargs: raise TypeError('Cannot pass client') diff --git a/gcloud/datastore/connection.py b/google/cloud/datastore/connection.py similarity index 93% rename from gcloud/datastore/connection.py rename to google/cloud/datastore/connection.py index f7af0d827d75..66988a4c17ff 100644 --- a/gcloud/datastore/connection.py +++ b/google/cloud/datastore/connection.py @@ -12,23 +12,23 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Connections to gcloud datastore API servers.""" +"""Connections to Google Cloud Datastore API servers.""" import os from google.rpc import status_pb2 -from gcloud._helpers import make_stub -from gcloud import connection as connection_module -from gcloud.environment_vars import GCD_HOST -from gcloud.exceptions import Conflict -from gcloud.exceptions import make_exception -from gcloud.datastore._generated import datastore_pb2 as _datastore_pb2 +from google.cloud._helpers import make_stub +from google.cloud import connection as connection_module +from google.cloud.environment_vars import GCD_HOST +from google.cloud.exceptions import Conflict +from google.cloud.exceptions import make_exception +from google.cloud.datastore._generated import datastore_pb2 as _datastore_pb2 # pylint: disable=ungrouped-imports try: from grpc import StatusCode from grpc._channel import _Rendezvous - from gcloud.datastore._generated import datastore_grpc_pb2 + from google.cloud.datastore._generated import datastore_grpc_pb2 except ImportError: # pragma: NO COVER _HAVE_GRPC = False datastore_grpc_pb2 = None @@ -53,7 +53,7 @@ class _DatastoreAPIOverHttp(object): Methods make bare API requests without any helpers for constructing the requests or parsing the responses. - :type connection: :class:`gcloud.datastore.connection.Connection` + :type connection: :class:`google.cloud.datastore.connection.Connection` :param connection: A connection object that contains helpful information for making requests. """ @@ -77,8 +77,8 @@ def _request(self, project, method, data): :rtype: string :returns: The string response content from the API call. - :raises: :class:`gcloud.exceptions.GCloudError` if the response - code is not 200 OK. + :raises: :class:`google.cloud.exceptions.GoogleCloudError` if the + response code is not 200 OK. """ headers = { 'Content-Type': 'application/x-protobuf', @@ -227,7 +227,7 @@ class _DatastoreAPIOverGRPC(object): Methods make bare API requests without any helpers for constructing the requests or parsing the responses. - :type connection: :class:`gcloud.datastore.connection.Connection` + :type connection: :class:`google.cloud.datastore.connection.Connection` :param connection: A connection object that contains helpful information for making requests. """ @@ -423,12 +423,12 @@ def lookup(self, project, key_pbs, Maps the ``DatastoreService.Lookup`` protobuf RPC. This uses mostly protobufs - (:class:`gcloud.datastore._generated.entity_pb2.Key` as input and - :class:`gcloud.datastore._generated.entity_pb2.Entity` as output). It - is used under the hood in + (:class:`google.cloud.datastore._generated.entity_pb2.Key` as input + and :class:`google.cloud.datastore._generated.entity_pb2.Entity` + as output). It is used under the hood in :meth:`Client.get() <.datastore.client.Client.get>`: - >>> from gcloud import datastore + >>> from google.cloud import datastore >>> client = datastore.Client(project='project') >>> key = client.key('MyKind', 1234) >>> client.get(key) @@ -443,7 +443,7 @@ def lookup(self, project, key_pbs, :param project: The project to look up the keys in. :type key_pbs: list of - :class:`gcloud.datastore._generated.entity_pb2.Key` + :class:`google.cloud.datastore._generated.entity_pb2.Key` :param key_pbs: The keys to retrieve from the datastore. :type eventual: bool @@ -459,9 +459,9 @@ def lookup(self, project, key_pbs, :rtype: tuple :returns: A triple of (``results``, ``missing``, ``deferred``) where both ``results`` and ``missing`` are lists of - :class:`gcloud.datastore._generated.entity_pb2.Entity` and - ``deferred`` is a list of - :class:`gcloud.datastore._generated.entity_pb2.Key`. + :class:`google.cloud.datastore._generated.entity_pb2.Entity` + and ``deferred`` is a list of + :class:`google.cloud.datastore._generated.entity_pb2.Key`. """ lookup_request = _datastore_pb2.LookupRequest() _set_read_options(lookup_request, eventual, transaction_id) @@ -485,15 +485,15 @@ def run_query(self, project, query_pb, namespace=None, matching the query. You typically wouldn't use this method directly, in favor of the - :meth:`gcloud.datastore.query.Query.fetch` method. + :meth:`google.cloud.datastore.query.Query.fetch` method. - Under the hood, the :class:`gcloud.datastore.query.Query` class + Under the hood, the :class:`google.cloud.datastore.query.Query` class uses this method to fetch data. :type project: string :param project: The project over which to run the query. - :type query_pb: :class:`gcloud.datastore._generated.query_pb2.Query` + :type query_pb: :class:`.datastore._generated.query_pb2.Query` :param query_pb: The Protobuf representing the query to run. :type namespace: string @@ -604,10 +604,10 @@ def allocate_ids(self, project, key_pbs): :param project: The project to which the transaction belongs. :type key_pbs: list of - :class:`gcloud.datastore._generated.entity_pb2.Key` + :class:`google.cloud.datastore._generated.entity_pb2.Key` :param key_pbs: The keys for which the backend should allocate IDs. - :rtype: list of :class:`gcloud.datastore._generated.entity_pb2.Key` + :rtype: list of :class:`.datastore._generated.entity_pb2.Key` :returns: An equal number of keys, with IDs filled in by the backend. """ request = _datastore_pb2.AllocateIdsRequest() @@ -641,7 +641,7 @@ def _add_keys_to_request(request_field_pb, key_pbs): :type request_field_pb: `RepeatedCompositeFieldContainer` :param request_field_pb: A repeated proto field that contains keys. - :type key_pbs: list of :class:`gcloud.datastore._generated.entity_pb2.Key` + :type key_pbs: list of :class:`.datastore._generated.entity_pb2.Key` :param key_pbs: The keys to add to a request. """ for key_pb in key_pbs: diff --git a/gcloud/datastore/entity.py b/google/cloud/datastore/entity.py similarity index 91% rename from gcloud/datastore/entity.py rename to google/cloud/datastore/entity.py index 249d57bc079a..d9ad4473f224 100644 --- a/gcloud/datastore/entity.py +++ b/google/cloud/datastore/entity.py @@ -15,7 +15,7 @@ """Class for representing a single entity in the Cloud Datastore.""" -from gcloud._helpers import _ensure_tuple_or_list +from google.cloud._helpers import _ensure_tuple_or_list class Entity(dict): @@ -24,7 +24,7 @@ class Entity(dict): An entity storing the actual instance of data. Each entity is officially represented with a - :class:`gcloud.datastore.key.Key` class, however it is possible that + :class:`google.cloud.datastore.key.Key` class, however it is possible that you might create an Entity with only a partial Key (that is, a Key with a Kind, and possibly a parent, but without an ID). In such a case, the datastore service will automatically assign an ID to the @@ -37,9 +37,9 @@ class Entity(dict): This means you could take an existing entity and change the key to duplicate the object. - Use :func:`gcloud.datastore.get` to retrieve an existing entity. + Use :func:`google.cloud.datastore.get` to retrieve an existing entity. - >>> from gcloud import datastore + >>> from google.cloud import datastore >>> client = datastore.Client() >>> client.get(key) @@ -68,7 +68,7 @@ class Entity(dict): Python3), will be saved using the 'blob_value' field, without any decoding / encoding step. - :type key: :class:`gcloud.datastore.key.Key` + :type key: :class:`google.cloud.datastore.key.Key` :param key: Optional key to be set on entity. :type exclude_from_indexes: tuple of string @@ -82,7 +82,7 @@ def __init__(self, key=None, exclude_from_indexes=()): self._exclude_from_indexes = set(_ensure_tuple_or_list( 'exclude_from_indexes', exclude_from_indexes)) # NOTE: This will be populated when parsing a protobuf in - # gcloud.datastore.helpers.entity_from_protobuf. + # google.cloud.datastore.helpers.entity_from_protobuf. self._meanings = {} def __eq__(self, other): @@ -118,7 +118,7 @@ def kind(self): """Get the kind of the current entity. .. note:: - This relies entirely on the :class:`gcloud.datastore.key.Key` + This relies entirely on the :class:`google.cloud.datastore.key.Key` set on the entity. That means that we're not storing the kind of the entity at all, just the properties and a pointer to a Key which knows its Kind. diff --git a/gcloud/datastore/helpers.py b/google/cloud/datastore/helpers.py similarity index 90% rename from gcloud/datastore/helpers.py rename to google/cloud/datastore/helpers.py index ff6df78f2ddc..2725308351d6 100644 --- a/gcloud/datastore/helpers.py +++ b/google/cloud/datastore/helpers.py @@ -24,11 +24,13 @@ from google.type import latlng_pb2 import six -from gcloud._helpers import _datetime_to_pb_timestamp -from gcloud._helpers import _pb_timestamp_to_datetime -from gcloud.datastore._generated import entity_pb2 as _entity_pb2 -from gcloud.datastore.entity import Entity -from gcloud.datastore.key import Key +# pylint: disable=ungrouped-imports +from google.cloud._helpers import _datetime_to_pb_timestamp +from google.cloud._helpers import _pb_timestamp_to_datetime +from google.cloud.datastore._generated import entity_pb2 as _entity_pb2 +from google.cloud.datastore.entity import Entity +from google.cloud.datastore.key import Key +# pylint: enable=ungrouped-imports __all__ = ('entity_from_protobuf', 'key_from_protobuf') @@ -36,7 +38,7 @@ def _get_meaning(value_pb, is_list=False): """Get the meaning from a protobuf value. - :type value_pb: :class:`gcloud.datastore._generated.entity_pb2.Value` + :type value_pb: :class:`google.cloud.datastore._generated.entity_pb2.Value` :param value_pb: The protobuf value to be checked for an associated meaning. @@ -77,13 +79,13 @@ def _get_meaning(value_pb, is_list=False): def _new_value_pb(entity_pb, name): """Add (by name) a new ``Value`` protobuf to an entity protobuf. - :type entity_pb: :class:`gcloud.datastore._generated.entity_pb2.Entity` + :type entity_pb: :class:`.datastore._generated.entity_pb2.Entity` :param entity_pb: An entity protobuf to add a new property to. :type name: string :param name: The name of the new property. - :rtype: :class:`gcloud.datastore._generated.entity_pb2.Value` + :rtype: :class:`google.cloud.datastore._generated.entity_pb2.Value` :returns: The new ``Value`` protobuf that was added to the entity. """ return entity_pb.properties.get_or_create(name) @@ -92,7 +94,7 @@ def _new_value_pb(entity_pb, name): def _property_tuples(entity_pb): """Iterator of name, ``Value`` tuples from entity properties. - :type entity_pb: :class:`gcloud.datastore._generated.entity_pb2.Entity` + :type entity_pb: :class:`.datastore._generated.entity_pb2.Entity` :param entity_pb: An entity protobuf to add a new property to. :rtype: :class:`generator` @@ -108,10 +110,10 @@ def entity_from_protobuf(pb): The protobuf should be one returned from the Cloud Datastore Protobuf API. - :type pb: :class:`gcloud.datastore._generated.entity_pb2.Entity` + :type pb: :class:`google.cloud.datastore._generated.entity_pb2.Entity` :param pb: The Protobuf representing the entity. - :rtype: :class:`gcloud.datastore.entity.Entity` + :rtype: :class:`google.cloud.datastore.entity.Entity` :returns: The entity derived from the protobuf. """ key = None @@ -159,7 +161,7 @@ def _set_pb_meaning_from_entity(entity, name, value, value_pb, is_list=False): """Add meaning information (from an entity) to a protobuf. - :type entity: :class:`gcloud.datastore.entity.Entity` + :type entity: :class:`google.cloud.datastore.entity.Entity` :param entity: The entity to be turned into a protobuf. :type name: string @@ -168,7 +170,7 @@ def _set_pb_meaning_from_entity(entity, name, value, value_pb, :type value: object :param value: The current value stored as property ``name``. - :type value_pb: :class:`gcloud.datastore._generated.entity_pb2.Value` + :type value_pb: :class:`google.cloud.datastore._generated.entity_pb2.Value` :param value_pb: The protobuf value to add meaning / meanings to. :type is_list: bool @@ -200,10 +202,10 @@ def _set_pb_meaning_from_entity(entity, name, value, value_pb, def entity_to_protobuf(entity): """Converts an entity into a protobuf. - :type entity: :class:`gcloud.datastore.entity.Entity` + :type entity: :class:`google.cloud.datastore.entity.Entity` :param entity: The entity to be turned into a protobuf. - :rtype: :class:`gcloud.datastore._generated.entity_pb2.Entity` + :rtype: :class:`google.cloud.datastore._generated.entity_pb2.Entity` :returns: The protobuf representing the entity. """ entity_pb = _entity_pb2.Entity() @@ -241,10 +243,10 @@ def key_from_protobuf(pb): The protobuf should be one returned from the Cloud Datastore Protobuf API. - :type pb: :class:`gcloud.datastore._generated.entity_pb2.Key` + :type pb: :class:`google.cloud.datastore._generated.entity_pb2.Key` :param pb: The Protobuf representing the key. - :rtype: :class:`gcloud.datastore.key.Key` + :rtype: :class:`google.cloud.datastore.key.Key` :returns: a new `Key` instance """ path_args = [] @@ -277,7 +279,7 @@ def _pb_attr_value(val): Certain value types need to be coerced into a different type (such as a `datetime.datetime` into an integer timestamp, or a - `gcloud.datastore.key.Key` into a Protobuf representation. This + `google.cloud.datastore.key.Key` into a Protobuf representation. This function handles that for you. .. note:: @@ -292,7 +294,7 @@ def _pb_attr_value(val): >>> _pb_attr_value('my_string') ('string_value', 'my_string') - :type val: `datetime.datetime`, :class:`gcloud.datastore.key.Key`, + :type val: `datetime.datetime`, :class:`google.cloud.datastore.key.Key`, bool, float, integer, string :param val: The value to be scrutinized. @@ -339,7 +341,7 @@ def _get_value_from_value_pb(value_pb): Some work is done to coerce the return value into a more useful type (particularly in the case of a timestamp value, or a key value). - :type value_pb: :class:`gcloud.datastore._generated.entity_pb2.Value` + :type value_pb: :class:`google.cloud.datastore._generated.entity_pb2.Value` :param value_pb: The Value Protobuf. :rtype: object @@ -399,12 +401,12 @@ def _set_protobuf_value(value_pb, val): Some value types (entities, keys, lists) cannot be directly assigned; this function handles them correctly. - :type value_pb: :class:`gcloud.datastore._generated.entity_pb2.Value` + :type value_pb: :class:`google.cloud.datastore._generated.entity_pb2.Value` :param value_pb: The value protobuf to which the value is being assigned. :type val: :class:`datetime.datetime`, boolean, float, integer, string, - :class:`gcloud.datastore.key.Key`, - :class:`gcloud.datastore.entity.Entity` + :class:`google.cloud.datastore.key.Key`, + :class:`google.cloud.datastore.entity.Entity` :param val: The value to be assigned. """ attr, val = _pb_attr_value(val) diff --git a/gcloud/datastore/key.py b/google/cloud/datastore/key.py similarity index 95% rename from gcloud/datastore/key.py rename to google/cloud/datastore/key.py index bfa7d67ad2a2..c01c6097a04d 100644 --- a/gcloud/datastore/key.py +++ b/google/cloud/datastore/key.py @@ -12,12 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Create / interact with gcloud datastore keys.""" +"""Create / interact with Google Cloud Datastore keys.""" import copy import six -from gcloud.datastore._generated import entity_pb2 as _entity_pb2 +from google.cloud.datastore._generated import entity_pb2 as _entity_pb2 class Key(object): @@ -53,7 +53,7 @@ class Key(object): * namespace (string): A namespace identifier for the key. * project (string): The project associated with the key. - * parent (:class:`gcloud.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. """ @@ -193,7 +193,7 @@ def _clone(self): Most attributes are simple types, so don't require copying. Other attributes like ``parent`` are long-lived and so we re-use them. - :rtype: :class:`gcloud.datastore.key.Key` + :rtype: :class:`google.cloud.datastore.key.Key` :returns: A new ``Key`` instance with the same data as the current one. """ cloned_self = self.__class__(*self.flat_path, @@ -210,7 +210,7 @@ def completed_key(self, id_or_name): :type id_or_name: string or integer :param id_or_name: ID or name to be added to the key. - :rtype: :class:`gcloud.datastore.key.Key` + :rtype: :class:`google.cloud.datastore.key.Key` :returns: A new ``Key`` instance with the same data as the current one and an extra ID or name added. :raises: :class:`ValueError` if the current key is not partial or if @@ -235,7 +235,7 @@ def completed_key(self, id_or_name): def to_protobuf(self): """Return a protobuf corresponding to the key. - :rtype: :class:`gcloud.datastore._generated.entity_pb2.Key` + :rtype: :class:`google.cloud.datastore._generated.entity_pb2.Key` :returns: The protobuf representing the key. """ key = _entity_pb2.Key() @@ -346,7 +346,7 @@ def _make_parent(self): Extracts all but the last element in the key path and creates a new key, while still matching the namespace and the project. - :rtype: :class:`gcloud.datastore.key.Key` or :class:`NoneType` + :rtype: :class:`google.cloud.datastore.key.Key` or :class:`NoneType` :returns: A new ``Key`` instance, whose path consists of all but the last element of current path. If the current key has only one path element, returns ``None``. @@ -363,7 +363,7 @@ def _make_parent(self): def parent(self): """The parent of the current key. - :rtype: :class:`gcloud.datastore.key.Key` or :class:`NoneType` + :rtype: :class:`google.cloud.datastore.key.Key` or :class:`NoneType` :returns: A new ``Key`` instance, whose path consists of all but the last element of current path. If the current key has only one path element, returns ``None``. @@ -388,7 +388,7 @@ def _validate_project(project, parent): :type project: string :param project: A project. - :type parent: :class:`gcloud.datastore.key.Key` or ``NoneType`` + :type parent: :class:`google.cloud.datastore.key.Key` or ``NoneType`` :param parent: The parent of the key or ``None``. :rtype: string diff --git a/gcloud/datastore/query.py b/google/cloud/datastore/query.py similarity index 94% rename from gcloud/datastore/query.py rename to google/cloud/datastore/query.py index 75652bb56dbf..e368be8256a3 100644 --- a/gcloud/datastore/query.py +++ b/google/cloud/datastore/query.py @@ -12,14 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Create / interact with gcloud datastore queries.""" +"""Create / interact with Google Cloud Datastore queries.""" import base64 -from gcloud._helpers import _ensure_tuple_or_list -from gcloud.datastore._generated import query_pb2 as _query_pb2 -from gcloud.datastore import helpers -from gcloud.datastore.key import Key +from google.cloud._helpers import _ensure_tuple_or_list +from google.cloud.datastore._generated import query_pb2 as _query_pb2 +from google.cloud.datastore import helpers +from google.cloud.datastore.key import Key class Query(object): @@ -28,7 +28,7 @@ class Query(object): This class serves as an abstraction for creating a query over data stored in the Cloud Datastore. - :type client: :class:`gcloud.datastore.client.Client` + :type client: :class:`google.cloud.datastore.client.Client` :param client: The client used to connect to Datastore. :type kind: string @@ -42,7 +42,7 @@ class Query(object): :param namespace: The namespace to which to restrict results. If not passed, uses the client's value. - :type ancestor: :class:`gcloud.datastore.key.Key` or None + :type ancestor: :class:`google.cloud.datastore.key.Key` or None :param ancestor: key of the ancestor to which this query's results are restricted. @@ -197,7 +197,7 @@ def add_filter(self, property_name, operator, value): and operator is one of ``OPERATORS`` (ie, ``=``, ``<``, ``<=``, ``>``, ``>=``):: - >>> from gcloud import datastore + >>> from google.cloud import datastore >>> client = datastore.Client() >>> query = client.query(kind='Person') >>> query.add_filter('name', '=', 'James') @@ -212,7 +212,7 @@ def add_filter(self, property_name, operator, value): :type value: :class:`int`, :class:`str`, :class:`bool`, :class:`float`, :class:`NoneType`, :class:`datetime.datetime`, - :class:`gcloud.datastore.key.Key` + :class:`google.cloud.datastore.key.Key` :param value: The value to filter on. :raises: :class:`ValueError` if ``operation`` is not one of the @@ -257,7 +257,7 @@ def keys_only(self): def key_filter(self, key, operator='='): """Filter on a key. - :type key: :class:`gcloud.datastore.key.Key` + :type key: :class:`google.cloud.datastore.key.Key` :param key: The key to filter on. :type operator: string @@ -318,7 +318,7 @@ def fetch(self, limit=None, offset=0, start_cursor=None, end_cursor=None, For example:: - >>> from gcloud import datastore + >>> from google.cloud import datastore >>> client = datastore.Client() >>> query = client.query(kind='Person') >>> query.add_filter('name', '=', 'Sally') @@ -339,7 +339,7 @@ def fetch(self, limit=None, offset=0, start_cursor=None, end_cursor=None, :type end_cursor: bytes :param end_cursor: An optional cursor passed through to the iterator. - :type client: :class:`gcloud.datastore.client.Client` + :type client: :class:`google.cloud.datastore.client.Client` :param client: client used to connect to datastore. If not supplied, uses the query's value. @@ -358,12 +358,12 @@ def fetch(self, limit=None, offset=0, start_cursor=None, end_cursor=None, class Iterator(object): """Represent the state of a given execution of a Query. - :type query: :class:`gcloud.datastore.query.Query` + :type query: :class:`google.cloud.datastore.query.Query` :param query: Query object holding permanent configuration (i.e. things that don't change on with each page in a results set). - :type client: :class:`gcloud.datastore.client.Client` + :type client: :class:`google.cloud.datastore.client.Client` :param client: The client used to make a request. :type limit: integer @@ -457,7 +457,7 @@ def next_page(self): def __iter__(self): """Generator yielding all results matching our query. - :rtype: sequence of :class:`gcloud.datastore.entity.Entity` + :rtype: sequence of :class:`google.cloud.datastore.entity.Entity` """ while True: self.next_page() @@ -480,7 +480,7 @@ def _pb_from_query(query): :type query: :class:`Query` :param query: The source query. - :rtype: :class:`gcloud.datastore._generated.query_pb2.Query` + :rtype: :class:`google.cloud.datastore._generated.query_pb2.Query` :returns: A protobuf that can be sent to the protobuf API. N.b. that it does not contain "in-flight" fields for ongoing query executions (cursors, offset, limit). diff --git a/gcloud/datastore/transaction.py b/google/cloud/datastore/transaction.py similarity index 94% rename from gcloud/datastore/transaction.py rename to google/cloud/datastore/transaction.py index c3ee420a1d36..66ef8bb7c857 100644 --- a/gcloud/datastore/transaction.py +++ b/google/cloud/datastore/transaction.py @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Create / interact with gcloud datastore transactions.""" +"""Create / interact with Google Cloud Datastore transactions.""" -from gcloud.datastore.batch import Batch +from google.cloud.datastore.batch import Batch class Transaction(Batch): @@ -27,7 +27,7 @@ class Transaction(Batch): operations (either ``insert`` or ``upsert``) into the same mutation, and execute those within a transaction:: - >>> from gcloud import datastore + >>> from google.cloud import datastore >>> client = datastore.Client() >>> with client.transaction(): ... client.put_multi([entity1, entity2]) @@ -86,7 +86,7 @@ class Transaction(Batch): ... else: ... transaction.commit() - :type client: :class:`gcloud.datastore.client.Client` + :type client: :class:`google.cloud.datastore.client.Client` :param client: the client used to connect to datastore. """ @@ -111,7 +111,7 @@ def current(self): If the topmost element on the stack is not a transaction, returns None. - :rtype: :class:`gcloud.datastore.transaction.Transaction` or None + :rtype: :class:`google.cloud.datastore.transaction.Transaction` or None :returns: The current transaction (if any are active). """ top = super(Transaction, self).current() diff --git a/gcloud/dns/__init__.py b/google/cloud/dns/__init__.py similarity index 54% rename from gcloud/dns/__init__.py rename to google/cloud/dns/__init__.py index f92c143d0277..51a4732a2676 100644 --- a/gcloud/dns/__init__.py +++ b/google/cloud/dns/__init__.py @@ -16,18 +16,20 @@ The main concepts with this API are: -- :class:`gcloud.DNS.zone.ManagedZone` represents an collection of tables. -- :class:`gcloud.DNS.resource_record_set.ResourceRecordSet` represents a - single resource definition within a zone. -- :class:`gcloud.DNS.changes.Changes` represents a set of changes (adding/ - deleting resource record sets) to a zone. +- :class:`~google.cloud.DNS.zone.ManagedZone` represents an collection of + tables. +- :class:`~google.cloud.DNS.resource_record_set.ResourceRecordSet` represents + a single resource definition within a zone. +- :class:`~google.cloud.DNS.changes.Changes` represents a set of changes + (adding/deleting resource record sets) to a zone. """ -from gcloud.dns.zone import Changes -from gcloud.dns.client import Client -from gcloud.dns.connection import Connection -from gcloud.dns.zone import ManagedZone -from gcloud.dns.resource_record_set import ResourceRecordSet + +from google.cloud.dns.zone import Changes +from google.cloud.dns.client import Client +from google.cloud.dns.connection import Connection +from google.cloud.dns.zone import ManagedZone +from google.cloud.dns.resource_record_set import ResourceRecordSet SCOPE = Connection.SCOPE diff --git a/gcloud/dns/changes.py b/google/cloud/dns/changes.py similarity index 87% rename from gcloud/dns/changes.py rename to google/cloud/dns/changes.py index eef7efe59e5c..eb68bdc80e46 100644 --- a/gcloud/dns/changes.py +++ b/google/cloud/dns/changes.py @@ -16,20 +16,20 @@ import six -from gcloud._helpers import _rfc3339_to_datetime -from gcloud.exceptions import NotFound -from gcloud.dns.resource_record_set import ResourceRecordSet +from google.cloud._helpers import _rfc3339_to_datetime +from google.cloud.exceptions import NotFound +from google.cloud.dns.resource_record_set import ResourceRecordSet class Changes(object): """Changes are bundled additions / deletions of DNS resource records. - Changes are owned by a :class:`gcloud.dns.zone.ManagedZone` instance. + Changes are owned by a :class:`google.cloud.dns.zone.ManagedZone` instance. See: https://cloud.google.com/dns/api/v1/changes - :type zone: :class:`gcloud.dns.zone.ManagedZone` + :type zone: :class:`google.cloud.dns.zone.ManagedZone` :param zone: A zone which holds one or more record sets. """ @@ -45,10 +45,10 @@ def from_api_repr(cls, resource, zone): :type resource: dict :param resource: change set representation returned from the API. - :type zone: :class:`gcloud.dns.zone.ManagedZone` + :type zone: :class:`google.cloud.dns.zone.ManagedZone` :param zone: A zone which holds zero or more change sets. - :rtype: :class:`gcloud.dns.changes.Changes` + :rtype: :class:`google.cloud.dns.changes.Changes` :returns: RRS parsed from ``resource``. """ changes = cls(zone=zone) @@ -125,7 +125,7 @@ def additions(self): """Resource record sets to be added to the zone. :rtype: sequence of - :class:`gcloud.dns.resource_record_set.ResourceRecordSet`. + :class:`google.cloud.dns.resource_record_set.ResourceRecordSet`. :returns: record sets appended via :meth:`add_record_set`. """ return self._additions @@ -135,7 +135,7 @@ def deletions(self): """Resource record sets to be deleted from the zone. :rtype: sequence of - :class:`gcloud.dns.resource_record_set.ResourceRecordSet`. + :class:`google.cloud.dns.resource_record_set.ResourceRecordSet`. :returns: record sets appended via :meth:`delete_record_set`. """ return self._deletions @@ -144,7 +144,7 @@ def add_record_set(self, record_set): """Append a record set to the 'additions' for the change set. :type record_set: - :class:`gcloud.dns.resource_record_set.ResourceRecordSet` + :class:`google.cloud.dns.resource_record_set.ResourceRecordSet` :param record_set: the record set to append. :raises: ``ValueError`` if ``record_set`` is not of the required type. @@ -157,7 +157,7 @@ def delete_record_set(self, record_set): """Append a record set to the 'deletions' for the change set. :type record_set: - :class:`gcloud.dns.resource_record_set.ResourceRecordSet` + :class:`google.cloud.dns.resource_record_set.ResourceRecordSet` :param record_set: the record set to append. :raises: ``ValueError`` if ``record_set`` is not of the required type. @@ -169,11 +169,11 @@ def delete_record_set(self, record_set): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.dns.client.Client` or ``NoneType`` + :type client: :class:`google.cloud.dns.client.Client` or ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current zone. - :rtype: :class:`gcloud.dns.client.Client` + :rtype: :class:`google.cloud.dns.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -207,7 +207,7 @@ def create(self, client=None): See: https://cloud.google.com/dns/api/v1/changes/create - :type client: :class:`gcloud.dns.client.Client` or ``NoneType`` + :type client: :class:`google.cloud.dns.client.Client` or ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current zone. """ @@ -226,7 +226,7 @@ def exists(self, client=None): See https://cloud.google.com/dns/api/v1/changes/get - :type client: :class:`gcloud.dns.client.Client` or ``NoneType`` + :type client: :class:`google.cloud.dns.client.Client` or ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current zone. @@ -248,7 +248,7 @@ def reload(self, client=None): See https://cloud.google.com/dns/api/v1/changes/get - :type client: :class:`gcloud.dns.client.Client` or ``NoneType`` + :type client: :class:`google.cloud.dns.client.Client` or ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current zone. """ diff --git a/gcloud/dns/client.py b/google/cloud/dns/client.py similarity index 94% rename from gcloud/dns/client.py rename to google/cloud/dns/client.py index 57f6041641e5..4058890b3397 100644 --- a/gcloud/dns/client.py +++ b/google/cloud/dns/client.py @@ -15,9 +15,9 @@ """Client for interacting with the Google Cloud DNS API.""" -from gcloud.client import JSONClient -from gcloud.dns.connection import Connection -from gcloud.dns.zone import ManagedZone +from google.cloud.client import JSONClient +from google.cloud.dns.connection import Connection +from google.cloud.dns.zone import ManagedZone class Client(JSONClient): @@ -75,7 +75,7 @@ def list_zones(self, max_results=None, page_token=None): zones. :rtype: tuple, (list, str) - :returns: list of :class:`gcloud.dns.zone.ManagedZone`, plus a + :returns: list of :class:`google.cloud.dns.zone.ManagedZone`, plus a "next page token" string: if the token is not None, indicates that more zones can be retrieved with another call (pass that value as ``page_token``). @@ -109,7 +109,7 @@ def zone(self, name, dns_name=None, description=None): :param description: the description for the zone. If not passed, defaults to the value of 'dns_name'. - :rtype: :class:`gcloud.dns.zone.ManagedZone` + :rtype: :class:`google.cloud.dns.zone.ManagedZone` :returns: a new ``ManagedZone`` instance. """ return ManagedZone(name, dns_name, client=self, diff --git a/gcloud/dns/connection.py b/google/cloud/dns/connection.py similarity index 91% rename from gcloud/dns/connection.py rename to google/cloud/dns/connection.py index e2b382fd9daa..22c4dcc94743 100644 --- a/gcloud/dns/connection.py +++ b/google/cloud/dns/connection.py @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Create / interact with gcloud dns connections.""" +"""Create / interact with Google Cloud DNS connections.""" -from gcloud import connection as base_connection +from google.cloud import connection as base_connection class Connection(base_connection.JSONConnection): diff --git a/gcloud/dns/resource_record_set.py b/google/cloud/dns/resource_record_set.py similarity index 88% rename from gcloud/dns/resource_record_set.py rename to google/cloud/dns/resource_record_set.py index 8d6e3cfbdf9c..c3b0974b4e0e 100644 --- a/gcloud/dns/resource_record_set.py +++ b/google/cloud/dns/resource_record_set.py @@ -18,7 +18,7 @@ class ResourceRecordSet(object): """ResourceRecordSets are DNS resource records. - RRS are owned by a :class:`gcloud.dns.zone.ManagedZone` instance. + RRS are owned by a :class:`google.cloud.dns.zone.ManagedZone` instance. See: https://cloud.google.com/dns/api/v1/resourceRecordSets @@ -35,7 +35,7 @@ class ResourceRecordSet(object): :type rrdatas: list of string :param rrdatas: one or more lines containing the resource data. - :type zone: :class:`gcloud.dns.zone.ManagedZone` + :type zone: :class:`google.cloud.dns.zone.ManagedZone` :param zone: A zone which holds one or more record sets. """ @@ -53,10 +53,10 @@ def from_api_repr(cls, resource, zone): :type resource: dict :param resource: record sets representation returned from the API - :type zone: :class:`gcloud.dns.zone.ManagedZone` + :type zone: :class:`google.cloud.dns.zone.ManagedZone` :param zone: A zone which holds one or more record sets. - :rtype: :class:`gcloud.dns.zone.ResourceRecordSet` + :rtype: :class:`google.cloud.dns.zone.ResourceRecordSet` :returns: RRS parsed from ``resource``. """ name = resource['name'] diff --git a/gcloud/dns/zone.py b/google/cloud/dns/zone.py similarity index 90% rename from gcloud/dns/zone.py rename to google/cloud/dns/zone.py index d6e9c569b3db..6613834847d9 100644 --- a/gcloud/dns/zone.py +++ b/google/cloud/dns/zone.py @@ -15,10 +15,10 @@ """Define API ManagedZones.""" import six -from gcloud._helpers import _rfc3339_to_datetime -from gcloud.exceptions import NotFound -from gcloud.dns.changes import Changes -from gcloud.dns.resource_record_set import ResourceRecordSet +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 class ManagedZone(object): @@ -34,7 +34,7 @@ class ManagedZone(object): :param dns_name: the DNS name of the zone. If not passed, then calls to :meth:`create` will fail. - :type client: :class:`gcloud.dns.client.Client` + :type client: :class:`google.cloud.dns.client.Client` :param client: A client which holds credentials and project configuration for the zone (which requires a project). @@ -59,11 +59,11 @@ def from_api_repr(cls, resource, client): :type resource: dict :param resource: zone resource representation returned from the API - :type client: :class:`gcloud.dns.client.Client` + :type client: :class:`google.cloud.dns.client.Client` :param client: Client which holds credentials and project configuration for the zone. - :rtype: :class:`gcloud.dns.zone.ManagedZone` + :rtype: :class:`google.cloud.dns.zone.ManagedZone` :returns: Zone parsed from ``resource``. """ name = resource.get('name') @@ -184,7 +184,7 @@ def resource_record_set(self, name, record_type, ttl, rrdatas): :type rrdatas: list of string :param rrdatas: resource data for the RR - :rtype: :class:`gcloud.dns.resource_record_set.ResourceRecordSet` + :rtype: :class:`google.cloud.dns.resource_record_set.ResourceRecordSet` :returns: a new ``ResourceRecordSet`` instance """ return ResourceRecordSet(name, record_type, ttl, rrdatas, zone=self) @@ -192,7 +192,7 @@ def resource_record_set(self, name, record_type, ttl, rrdatas): def changes(self): """Construct a change set bound to this zone. - :rtype: :class:`gcloud.dns.changes.Changes` + :rtype: :class:`google.cloud.dns.changes.Changes` :returns: a new ``Changes`` instance """ return Changes(zone=self) @@ -200,11 +200,11 @@ def changes(self): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.dns.client.Client` or ``NoneType`` + :type client: :class:`google.cloud.dns.client.Client` or ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current zone. - :rtype: :class:`gcloud.dns.client.Client` + :rtype: :class:`google.cloud.dns.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -248,7 +248,7 @@ def create(self, client=None): See: https://cloud.google.com/dns/api/v1/managedZones/create - :type client: :class:`gcloud.dns.client.Client` or ``NoneType`` + :type client: :class:`google.cloud.dns.client.Client` or ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current zone. """ @@ -264,7 +264,7 @@ def exists(self, client=None): See https://cloud.google.com/dns/api/v1/managedZones/get - :type client: :class:`gcloud.dns.client.Client` or ``NoneType`` + :type client: :class:`google.cloud.dns.client.Client` or ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current zone. @@ -287,7 +287,7 @@ def reload(self, client=None): See https://cloud.google.com/dns/api/v1/managedZones/get - :type client: :class:`gcloud.dns.client.Client` or ``NoneType`` + :type client: :class:`google.cloud.dns.client.Client` or ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current zone. """ @@ -303,7 +303,7 @@ def delete(self, client=None): See: https://cloud.google.com/dns/api/v1/managedZones/delete - :type client: :class:`gcloud.dns.client.Client` or ``NoneType`` + :type client: :class:`google.cloud.dns.client.Client` or ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current zone. """ @@ -326,13 +326,13 @@ def list_resource_record_sets(self, max_results=None, page_token=None, not passed, the API will return the first page of zones. - :type client: :class:`gcloud.dns.client.Client` or ``NoneType`` + :type client: :class:`google.cloud.dns.client.Client` or ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current zone. :rtype: tuple, (list, str) :returns: list of - :class:`gcloud.dns.resource_record_set.ResourceRecordSet`, + :class:`google.cloud.dns.resource_record_set.ResourceRecordSet`, plus a "next page token" string: if the token is not None, indicates that more zones can be retrieved with another call (pass that value as ``page_token``). @@ -369,13 +369,13 @@ def list_changes(self, max_results=None, page_token=None, client=None): not passed, the API will return the first page of zones. - :type client: :class:`gcloud.dns.client.Client` or ``NoneType`` + :type client: :class:`google.cloud.dns.client.Client` or ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current zone. :rtype: tuple, (list, str) :returns: list of - :class:`gcloud.dns.resource_record_set.ResourceRecordSet`, + :class:`google.cloud.dns.resource_record_set.ResourceRecordSet`, plus a "next page token" string: if the token is not None, indicates that more zones can be retrieved with another call (pass that value as ``page_token``). diff --git a/gcloud/environment_vars.py b/google/cloud/environment_vars.py similarity index 88% rename from gcloud/environment_vars.py rename to google/cloud/environment_vars.py index 344ffd3c8785..8beb66da24ac 100644 --- a/gcloud/environment_vars.py +++ b/google/cloud/environment_vars.py @@ -12,16 +12,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Comprehensive list of environment variables used in gcloud. +"""Comprehensive list of environment variables used in google-cloud. These enable many types of implicit behavior in both production and tests. """ -PROJECT = 'GCLOUD_PROJECT' +PROJECT = 'GOOGLE_CLOUD_PROJECT' """Environment variable defining default project.""" -TESTS_PROJECT = 'GCLOUD_TESTS_PROJECT_ID' +TESTS_PROJECT = 'GOOGLE_CLOUD_TESTS_PROJECT_ID' """Environment variable defining project for tests.""" GCD_DATASET = 'DATASTORE_DATASET' diff --git a/gcloud/error_reporting/__init__.py b/google/cloud/error_reporting/__init__.py similarity index 92% rename from gcloud/error_reporting/__init__.py rename to google/cloud/error_reporting/__init__.py index 01c84d109963..cecda4ded718 100644 --- a/gcloud/error_reporting/__init__.py +++ b/google/cloud/error_reporting/__init__.py @@ -14,4 +14,5 @@ """Client library for Stackdriver Error Reporting""" -from gcloud.error_reporting.client import Client + +from google.cloud.error_reporting.client import Client diff --git a/gcloud/error_reporting/client.py b/google/cloud/error_reporting/client.py similarity index 96% rename from gcloud/error_reporting/client.py rename to google/cloud/error_reporting/client.py index 544427d5958a..dc84c42016d7 100644 --- a/gcloud/error_reporting/client.py +++ b/google/cloud/error_reporting/client.py @@ -16,7 +16,7 @@ import traceback -import gcloud.logging.client +import google.cloud.logging.client import six @@ -105,7 +105,7 @@ def __init__(self, project=None, http=None, service=None, version=None): - self.logging_client = gcloud.logging.client.Client( + self.logging_client = google.cloud.logging.client.Client( project, credentials, http) self.service = service if service else self.DEFAULT_SERVICE self.version = version @@ -139,7 +139,7 @@ def _send_error_report(self, message, This should be a Python dict that contains the keys 'filePath', 'lineNumber', and 'functionName' - :type http_context: :class`gcloud.error_reporting.HTTPContext` + :type http_context: :class`google.cloud.error_reporting.HTTPContext` :param http_context: The HTTP request which was processed when the error was triggered. @@ -190,7 +190,7 @@ def report(self, message, http_context=None, user=None): :param message: A user-supplied message to report - :type http_context: :class`gcloud.error_reporting.HTTPContext` + :type http_context: :class`google.cloud.error_reporting.HTTPContext` :param http_context: The HTTP request which was processed when the error was triggered. @@ -226,7 +226,7 @@ def report_exception(self, http_context=None, user=None): """ Reports the details of the latest exceptions to Stackdriver Error Reporting. - :type http_context: :class`gcloud.error_reporting.HTTPContext` + :type http_context: :class`google.cloud.error_reporting.HTTPContext` :param http_context: The HTTP request which was processed when the error was triggered. diff --git a/gcloud/exceptions.py b/google/cloud/exceptions.py similarity index 91% rename from gcloud/exceptions.py rename to google/cloud/exceptions.py index b1072bbf134d..bc1349cb7d31 100644 --- a/gcloud/exceptions.py +++ b/google/cloud/exceptions.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Custom exceptions for :mod:`gcloud` package. +"""Custom exceptions for :mod:`google.cloud` package. See: https://cloud.google.com/storage/docs/json_api/v1/status-codes """ @@ -24,8 +24,8 @@ _HTTP_CODE_TO_EXCEPTION = {} # populated at end of module -class GCloudError(Exception): - """Base error class for gcloud errors (abstract). +class GoogleCloudError(Exception): + """Base error class for Google Cloud errors (abstract). Each subclass represents a single type of HTTP error response. """ @@ -36,7 +36,7 @@ class GCloudError(Exception): """ def __init__(self, message, errors=()): - super(GCloudError, self).__init__(message) + super(GoogleCloudError, self).__init__(message) self.message = message self._errors = errors @@ -53,7 +53,7 @@ def errors(self): return [copy.deepcopy(error) for error in self._errors] -class Redirection(GCloudError): +class Redirection(GoogleCloudError): """Base for 3xx responses This class is abstract. @@ -80,7 +80,7 @@ class ResumeIncomplete(Redirection): code = 308 -class ClientError(GCloudError): +class ClientError(GoogleCloudError): """Base for 4xx responses This class is abstract @@ -137,7 +137,7 @@ class TooManyRequests(ClientError): code = 429 -class ServerError(GCloudError): +class ServerError(GoogleCloudError): """Base for 5xx responses: (abstract)""" @@ -178,7 +178,7 @@ def make_exception(response, content, error_info=None, use_json=True): :type use_json: bool :param use_json: Flag indicating if ``content`` is expected to be JSON. - :rtype: instance of :class:`GCloudError`, or a concrete subclass. + :rtype: instance of :class:`GoogleCloudError`, or a concrete subclass. :returns: Exception specific to the error response. """ if isinstance(content, six.binary_type): @@ -206,7 +206,7 @@ def make_exception(response, content, error_info=None, use_json=True): try: klass = _HTTP_CODE_TO_EXCEPTION[response.status] except KeyError: - error = GCloudError(message, errors) + error = GoogleCloudError(message, errors) error.code = response.status else: error = klass(message, errors) @@ -222,7 +222,7 @@ def _walk_subclasses(klass): # Build the code->exception class mapping. -for _eklass in _walk_subclasses(GCloudError): +for _eklass in _walk_subclasses(GoogleCloudError): code = getattr(_eklass, 'code', None) if code is not None: _HTTP_CODE_TO_EXCEPTION[code] = _eklass diff --git a/gcloud/iterator.py b/google/cloud/iterator.py similarity index 99% rename from gcloud/iterator.py rename to google/cloud/iterator.py index ba62b6e47192..0ad5da167249 100644 --- a/gcloud/iterator.py +++ b/google/cloud/iterator.py @@ -48,7 +48,7 @@ def get_items_from_response(self, response): class Iterator(object): """A generic class for iterating through Cloud JSON APIs list responses. - :type client: :class:`gcloud.client.Client` + :type client: :class:`google.cloud.client.Client` :param client: The client, which owns a connection to make requests. :type path: string diff --git a/gcloud/language/__init__.py b/google/cloud/language/__init__.py similarity index 81% rename from gcloud/language/__init__.py rename to google/cloud/language/__init__.py index 4b1df7af3a16..86b3e451ee34 100644 --- a/gcloud/language/__init__.py +++ b/google/cloud/language/__init__.py @@ -14,6 +14,7 @@ """Client library for Google Cloud Natural Language API.""" -from gcloud.language.client import Client -from gcloud.language.document import Document -from gcloud.language.document import Encoding + +from google.cloud.language.client import Client +from google.cloud.language.document import Document +from google.cloud.language.document import Encoding diff --git a/gcloud/language/client.py b/google/cloud/language/client.py similarity index 96% rename from gcloud/language/client.py rename to google/cloud/language/client.py index 00702e4396a7..8a278b5e5cde 100644 --- a/gcloud/language/client.py +++ b/google/cloud/language/client.py @@ -15,9 +15,9 @@ """Basic client for Google Cloud Natural Language API.""" -from gcloud import client as client_module -from gcloud.language.connection import Connection -from gcloud.language.document import Document +from google.cloud import client as client_module +from google.cloud.language.connection import Connection +from google.cloud.language.document import Document class Client(client_module.Client): diff --git a/gcloud/language/connection.py b/google/cloud/language/connection.py similarity index 95% rename from gcloud/language/connection.py rename to google/cloud/language/connection.py index ac9ceaba6098..45acf476a57c 100644 --- a/gcloud/language/connection.py +++ b/google/cloud/language/connection.py @@ -14,7 +14,7 @@ """Basic connection for Google Cloud Natural Language API.""" -from gcloud import connection as base_connection +from google.cloud import connection as base_connection class Connection(base_connection.JSONConnection): diff --git a/gcloud/language/document.py b/google/cloud/language/document.py similarity index 97% rename from gcloud/language/document.py rename to google/cloud/language/document.py index e811dabb4f0d..975ea114087e 100644 --- a/gcloud/language/document.py +++ b/google/cloud/language/document.py @@ -19,10 +19,10 @@ import collections -from gcloud.language.entity import Entity -from gcloud.language.sentiment import Sentiment -from gcloud.language.syntax import Sentence -from gcloud.language.syntax import Token +from google.cloud.language.entity import Entity +from google.cloud.language.sentiment import Sentiment +from google.cloud.language.syntax import Sentence +from google.cloud.language.syntax import Token DEFAULT_LANGUAGE = 'en-US' @@ -72,7 +72,7 @@ class Document(object): stored on the document or referred to in a Google Cloud Storage object. - :type client: :class:`~gcloud.language.client.Client` + :type client: :class:`~google.cloud.language.client.Client` :param client: A client which holds credentials and other configuration. diff --git a/gcloud/language/entity.py b/google/cloud/language/entity.py similarity index 100% rename from gcloud/language/entity.py rename to google/cloud/language/entity.py diff --git a/gcloud/language/sentiment.py b/google/cloud/language/sentiment.py similarity index 100% rename from gcloud/language/sentiment.py rename to google/cloud/language/sentiment.py diff --git a/gcloud/language/syntax.py b/google/cloud/language/syntax.py similarity index 100% rename from gcloud/language/syntax.py rename to google/cloud/language/syntax.py diff --git a/gcloud/logging/__init__.py b/google/cloud/logging/__init__.py similarity index 78% rename from gcloud/logging/__init__.py rename to google/cloud/logging/__init__.py index 578d1c70aa29..62075824f637 100644 --- a/gcloud/logging/__init__.py +++ b/google/cloud/logging/__init__.py @@ -14,10 +14,9 @@ """Google Stackdriver Logging API wrapper.""" -from gcloud.logging.client import Client -from gcloud.logging.connection import Connection - - -SCOPE = Connection.SCOPE -ASCENDING = 'timestamp asc' -DESCENDING = 'timestamp desc' +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/gcloud/logging/_gax.py b/google/cloud/logging/_gax.py similarity index 97% rename from gcloud/logging/_gax.py rename to google/cloud/logging/_gax.py index 2619b572bc97..d84a58047ca3 100644 --- a/gcloud/logging/_gax.py +++ b/google/cloud/logging/_gax.py @@ -26,11 +26,13 @@ from google.protobuf.json_format import Parse from grpc import StatusCode -from gcloud._helpers import _datetime_to_pb_timestamp -from gcloud._helpers import _pb_timestamp_to_rfc3339 -from gcloud._helpers import exc_to_code -from gcloud.exceptions import Conflict -from gcloud.exceptions import NotFound +# pylint: disable=ungrouped-imports +from google.cloud._helpers import _datetime_to_pb_timestamp +from google.cloud._helpers import _pb_timestamp_to_rfc3339 +from google.cloud._helpers import exc_to_code +from google.cloud.exceptions import Conflict +from google.cloud.exceptions import NotFound +# pylint: enable=ungrouped-imports class _LoggingAPI(object): @@ -56,8 +58,8 @@ def list_entries(self, projects, filter_='', order_by='', https://cloud.google.com/logging/docs/view/advanced_filters :type order_by: str - :param order_by: One of :data:`gcloud.logging.ASCENDING` or - :data:`gcloud.logging.DESCENDING`. + :param order_by: One of :data:`~google.cloud.logging.client.ASCENDING` + or :data:`~google.cloud.logging.client.DESCENDING`. :type page_size: int :param page_size: maximum number of entries to return, If not passed, diff --git a/gcloud/logging/client.py b/google/cloud/logging/client.py similarity index 85% rename from gcloud/logging/client.py rename to google/cloud/logging/client.py index c51f502ac075..553f8929fd27 100644 --- a/gcloud/logging/client.py +++ b/google/cloud/logging/client.py @@ -23,9 +23,9 @@ LoggingServiceV2Api as GeneratedLoggingAPI) from google.cloud.logging.v2.metrics_service_v2_api import ( MetricsServiceV2Api as GeneratedMetricsAPI) - from gcloud.logging._gax import _LoggingAPI as GAXLoggingAPI - from gcloud.logging._gax import _MetricsAPI as GAXMetricsAPI - from gcloud.logging._gax import _SinksAPI as GAXSinksAPI + from google.cloud.logging._gax import _LoggingAPI as GAXLoggingAPI + from google.cloud.logging._gax import _MetricsAPI as GAXMetricsAPI + from google.cloud.logging._gax import _SinksAPI as GAXSinksAPI except ImportError: # pragma: NO COVER _HAVE_GAX = False GeneratedLoggingAPI = GAXLoggingAPI = None @@ -34,21 +34,25 @@ else: _HAVE_GAX = True -from gcloud.client import JSONClient -from gcloud.logging.connection import Connection -from gcloud.logging.connection import _LoggingAPI as JSONLoggingAPI -from gcloud.logging.connection import _MetricsAPI as JSONMetricsAPI -from gcloud.logging.connection import _SinksAPI as JSONSinksAPI -from gcloud.logging.entries import ProtobufEntry -from gcloud.logging.entries import StructEntry -from gcloud.logging.entries import TextEntry -from gcloud.logging.logger import Logger -from gcloud.logging.metric import Metric -from gcloud.logging.sink import Sink +from google.cloud.client import JSONClient +from google.cloud.logging.connection import Connection +from google.cloud.logging.connection import _LoggingAPI as JSONLoggingAPI +from google.cloud.logging.connection import _MetricsAPI as JSONMetricsAPI +from google.cloud.logging.connection import _SinksAPI as JSONSinksAPI +from google.cloud.logging.entries import ProtobufEntry +from google.cloud.logging.entries import StructEntry +from google.cloud.logging.entries import TextEntry +from google.cloud.logging.logger import Logger +from google.cloud.logging.metric import Metric +from google.cloud.logging.sink import Sink -_DISABLE_GAX = os.getenv('GCLOUD_DISABLE_GAX', False) +_DISABLE_GAX = os.getenv('GOOGLE_CLOUD_DISABLE_GAX', False) _USE_GAX = _HAVE_GAX and not _DISABLE_GAX +ASCENDING = 'timestamp asc' +"""Query string to order by ascending timestamps.""" +DESCENDING = 'timestamp desc' +"""Query string to order by decending timestamps.""" class Client(JSONClient): @@ -127,7 +131,7 @@ def logger(self, name): :type name: str :param name: the name of the logger to be constructed. - :rtype: :class:`gcloud.logging.logger.Logger` + :rtype: :class:`google.cloud.logging.logger.Logger` :returns: Logger created with the current client. """ return Logger(name, client=self) @@ -143,9 +147,9 @@ def _entry_from_resource(self, resource, loggers): passed, the entry will have a newly-created logger. :rtype: One of: - :class:`gcloud.logging.entries.TextEntry`, - :class:`gcloud.logging.entries.StructEntry`, - :class:`gcloud.logging.entries.ProtobufEntry` + :class:`google.cloud.logging.entries.TextEntry`, + :class:`google.cloud.logging.entries.StructEntry`, + :class:`google.cloud.logging.entries.ProtobufEntry` :returns: the entry instance, constructed via the resource """ if 'textPayload' in resource: @@ -172,8 +176,8 @@ def list_entries(self, projects=None, filter_=None, order_by=None, https://cloud.google.com/logging/docs/view/advanced_filters :type order_by: str - :param order_by: One of :data:`gcloud.logging.ASCENDING` or - :data:`gcloud.logging.DESCENDING`. + :param order_by: One of :data:`~google.cloud.logging.client.ASCENDING` + or :data:`~google.cloud.logging.client.DESCENDING`. :type page_size: int :param page_size: maximum number of entries to return, If not passed, @@ -185,7 +189,7 @@ def list_entries(self, projects=None, filter_=None, order_by=None, entries. :rtype: tuple, (list, str) - :returns: list of :class:`gcloud.logging.entry.TextEntry`, plus a + :returns: list of :class:`google.cloud.logging.entry.TextEntry`, plus a "next page token" string: if not None, indicates that more entries can be retrieved with another call (pass that value as ``page_token``). @@ -219,7 +223,7 @@ def sink(self, name, filter_=None, destination=None): already exist, to be refreshed via :meth:`Sink.reload`. - :rtype: :class:`gcloud.logging.sink.Sink` + :rtype: :class:`google.cloud.logging.sink.Sink` :returns: Sink created with the current client. """ return Sink(name, filter_, destination, client=self) @@ -240,7 +244,7 @@ def list_sinks(self, page_size=None, page_token=None): sinks. :rtype: tuple, (list, str) - :returns: list of :class:`gcloud.logging.sink.Sink`, plus a + :returns: list of :class:`google.cloud.logging.sink.Sink`, plus a "next page token" string: if not None, indicates that more sinks can be retrieved with another call (pass that value as ``page_token``). @@ -268,7 +272,7 @@ def metric(self, name, filter_=None, description=''): If not passed, the instance should already exist, to be refreshed via :meth:`Metric.reload`. - :rtype: :class:`gcloud.logging.metric.Metric` + :rtype: :class:`google.cloud.logging.metric.Metric` :returns: Metric created with the current client. """ return Metric(name, filter_, client=self, description=description) @@ -289,7 +293,7 @@ def list_metrics(self, page_size=None, page_token=None): metrics. :rtype: tuple, (list, str) - :returns: list of :class:`gcloud.logging.metric.Metric`, plus a + :returns: list of :class:`google.cloud.logging.metric.Metric`, plus a "next page token" string: if not None, indicates that more metrics can be retrieved with another call (pass that value as ``page_token``). diff --git a/gcloud/logging/connection.py b/google/cloud/logging/connection.py similarity index 97% rename from gcloud/logging/connection.py rename to google/cloud/logging/connection.py index 846d8ae5412e..dc0c95a0a976 100644 --- a/gcloud/logging/connection.py +++ b/google/cloud/logging/connection.py @@ -14,7 +14,7 @@ """Create / interact with Stackdriver Logging connections.""" -from gcloud import connection as base_connection +from google.cloud import connection as base_connection class Connection(base_connection.JSONConnection): @@ -55,7 +55,7 @@ class _LoggingAPI(object): https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/entries https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.logs - :type connection: :class:`gcloud.logging.connection.Connection` + :type connection: :class:`google.cloud.logging.connection.Connection` :param connection: the connection used to make API requests. """ def __init__(self, connection): @@ -77,8 +77,8 @@ def list_entries(self, projects, filter_=None, order_by=None, https://cloud.google.com/logging/docs/view/advanced_filters :type order_by: str - :param order_by: One of :data:`gcloud.logging.ASCENDING` or - :data:`gcloud.logging.DESCENDING`. + :param order_by: One of :data:`~google.cloud.logging.client.ASCENDING` + or :data:`~google.cloud.logging.client.DESCENDING`. :type page_size: int :param page_size: maximum number of entries to return, If not passed, @@ -171,7 +171,7 @@ class _SinksAPI(object): See: https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.sinks - :type connection: :class:`gcloud.logging.connection.Connection` + :type connection: :class:`google.cloud.logging.connection.Connection` :param connection: the connection used to make API requests. """ def __init__(self, connection): @@ -310,7 +310,7 @@ class _MetricsAPI(object): See: https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.metrics - :type connection: :class:`gcloud.logging.connection.Connection` + :type connection: :class:`google.cloud.logging.connection.Connection` :param connection: the connection used to make API requests. """ def __init__(self, connection): diff --git a/gcloud/logging/entries.py b/google/cloud/logging/entries.py similarity index 94% rename from gcloud/logging/entries.py rename to google/cloud/logging/entries.py index f8caaba3cdbd..3779c5062ce9 100644 --- a/gcloud/logging/entries.py +++ b/google/cloud/logging/entries.py @@ -19,8 +19,8 @@ from google.protobuf.json_format import Parse -from gcloud._helpers import _name_from_project_path -from gcloud._helpers import _rfc3339_nanos_to_datetime +from google.cloud._helpers import _name_from_project_path +from google.cloud._helpers import _rfc3339_nanos_to_datetime _LOGGER_TEMPLATE = re.compile(r""" @@ -53,7 +53,7 @@ class _BaseEntry(object): :param payload: The payload passed as ``textPayload``, ``jsonPayload``, or ``protoPayload``. - :type logger: :class:`gcloud.logging.logger.Logger` + :type logger: :class:`google.cloud.logging.logger.Logger` :param logger: the logger used to write the entry. :type insert_id: text, or :class:`NoneType` @@ -90,7 +90,7 @@ def from_api_repr(cls, resource, client, loggers=None): :param resource: text entry resource representation returned from the API - :type client: :class:`gcloud.logging.client.Client` + :type client: :class:`google.cloud.logging.client.Client` :param client: Client which holds credentials and project configuration. @@ -98,7 +98,7 @@ def from_api_repr(cls, resource, client, loggers=None): :param loggers: A mapping of logger fullnames -> loggers. If not passed, the entry will have a newly-created logger. - :rtype: :class:`gcloud.logging.entries.TextEntry` + :rtype: :class:`google.cloud.logging.entries.TextEntry` :returns: Text entry parsed from ``resource``. """ if loggers is None: diff --git a/gcloud/logging/handlers/__init__.py b/google/cloud/logging/handlers/__init__.py similarity index 83% rename from gcloud/logging/handlers/__init__.py rename to google/cloud/logging/handlers/__init__.py index 2f12851ba6e0..5d49a4eb8738 100644 --- a/gcloud/logging/handlers/__init__.py +++ b/google/cloud/logging/handlers/__init__.py @@ -14,5 +14,5 @@ """Python :mod:`logging` handlers for Google Cloud Logging.""" -from gcloud.logging.handlers.handlers import CloudLoggingHandler -from gcloud.logging.handlers.handlers import setup_logging +from google.cloud.logging.handlers.handlers import CloudLoggingHandler +from google.cloud.logging.handlers.handlers import setup_logging diff --git a/gcloud/logging/handlers/handlers.py b/google/cloud/logging/handlers/handlers.py similarity index 86% rename from gcloud/logging/handlers/handlers.py rename to google/cloud/logging/handlers/handlers.py index 8c12072651dc..c42da3b4f123 100644 --- a/gcloud/logging/handlers/handlers.py +++ b/google/cloud/logging/handlers/handlers.py @@ -16,11 +16,11 @@ import logging -from gcloud.logging.handlers.transports import BackgroundThreadTransport +from google.cloud.logging.handlers.transports import BackgroundThreadTransport EXCLUDE_LOGGER_DEFAULTS = ( - 'gcloud', + 'google.cloud', 'oauth2client' ) @@ -37,9 +37,9 @@ class CloudLoggingHandler(logging.StreamHandler): which means each logging statement that uses this handler will require an API call. - :type client: :class:`gcloud.logging.client` - :param client: the authenticated gcloud logging client for this handler - to use + :type client: :class:`google.cloud.logging.client` + :param client: the authenticated Google Cloud Logging client for this + handler to use :type name: str :param name: the name of the custom log in Stackdriver Logging. Defaults @@ -57,10 +57,10 @@ class CloudLoggingHandler(logging.StreamHandler): .. doctest:: - import gcloud.logging - from gcloud.logging.handlers import CloudLoggingHandler + import google.cloud.logging + from google.cloud.logging.handlers import CloudLoggingHandler - client = gcloud.logging.Client() + client = google.cloud.logging.Client() handler = CloudLoggingHandler(client) cloud_logger = logging.getLogger('cloudLogger') @@ -112,12 +112,12 @@ def setup_logging(handler, excluded_loggers=EXCLUDE_LOGGER_DEFAULTS): .. doctest:: import logging - import gcloud.logging - from gcloud.logging.handlers import CloudLoggingHandler + import google.cloud.logging + from google.cloud.logging.handlers import CloudLoggingHandler - client = gcloud.logging.Client() + client = google.cloud.logging.Client() handler = CloudLoggingHandler(client) - gcloud.logging.setup_logging(handler) + google.cloud.logging.setup_logging(handler) logging.getLogger().setLevel(logging.DEBUG) logging.error('bad news') # API call diff --git a/gcloud/logging/handlers/transports/__init__.py b/google/cloud/logging/handlers/transports/__init__.py similarity index 74% rename from gcloud/logging/handlers/transports/__init__.py rename to google/cloud/logging/handlers/transports/__init__.py index f9ca4239ddbe..b0e9d7c0a43e 100644 --- a/gcloud/logging/handlers/transports/__init__.py +++ b/google/cloud/logging/handlers/transports/__init__.py @@ -16,11 +16,11 @@ Currently two options are provided, a synchronous transport that makes an API call for each log statement, and an asynchronous handler that -sends the API using a :class:`~gcloud.logging.logger.Batch` object in +sends the API using a :class:`~google.cloud.logging.logger.Batch` object in the background. """ -from gcloud.logging.handlers.transports.base import Transport -from gcloud.logging.handlers.transports.sync import SyncTransport -from gcloud.logging.handlers.transports.background_thread import ( +from google.cloud.logging.handlers.transports.base import Transport +from google.cloud.logging.handlers.transports.sync import SyncTransport +from google.cloud.logging.handlers.transports.background_thread import ( BackgroundThreadTransport) diff --git a/gcloud/logging/handlers/transports/background_thread.py b/google/cloud/logging/handlers/transports/background_thread.py similarity index 96% rename from gcloud/logging/handlers/transports/background_thread.py rename to google/cloud/logging/handlers/transports/background_thread.py index 8909306cf55d..0e94fde1e1b7 100644 --- a/gcloud/logging/handlers/transports/background_thread.py +++ b/google/cloud/logging/handlers/transports/background_thread.py @@ -21,8 +21,8 @@ import copy import threading -from gcloud.logging import Client -from gcloud.logging.handlers.transports.base import Transport +from google.cloud.logging.client import Client +from google.cloud.logging.handlers.transports.base import Transport class _Worker(object): @@ -97,7 +97,7 @@ def _start(self): self._entries_condition.acquire() self._thread = threading.Thread( target=self._run, - name='gcloud.logging.handlers.transport.Worker') + name='google.cloud.logging.handlers.transport.Worker') self._thread.setDaemon(True) self._thread.start() finally: diff --git a/gcloud/logging/handlers/transports/base.py b/google/cloud/logging/handlers/transports/base.py similarity index 95% rename from gcloud/logging/handlers/transports/base.py rename to google/cloud/logging/handlers/transports/base.py index 8f9d65647cb6..edc5dff7d0e4 100644 --- a/gcloud/logging/handlers/transports/base.py +++ b/google/cloud/logging/handlers/transports/base.py @@ -16,7 +16,7 @@ class Transport(object): - """Base class for ``gcloud`` logging handler transports. + """Base class for Google Cloud Logging handler transports. Subclasses of :class:`Transport` must have constructors that accept a client and name object, and must override :meth:`send`. diff --git a/gcloud/logging/handlers/transports/sync.py b/google/cloud/logging/handlers/transports/sync.py similarity index 95% rename from gcloud/logging/handlers/transports/sync.py rename to google/cloud/logging/handlers/transports/sync.py index afa39d311a19..4255c71b1a30 100644 --- a/gcloud/logging/handlers/transports/sync.py +++ b/google/cloud/logging/handlers/transports/sync.py @@ -17,7 +17,7 @@ Logs directly to the the Stackdriver Logging API with a synchronous call. """ -from gcloud.logging.handlers.transports.base import Transport +from google.cloud.logging.handlers.transports.base import Transport class SyncTransport(Transport): diff --git a/gcloud/logging/logger.py b/google/cloud/logging/logger.py similarity index 92% rename from gcloud/logging/logger.py rename to google/cloud/logging/logger.py index 18d9f4b2b23f..031a21053ff2 100644 --- a/gcloud/logging/logger.py +++ b/google/cloud/logging/logger.py @@ -28,7 +28,7 @@ class Logger(object): :type name: string :param name: the name of the logger - :type client: :class:`gcloud.logging.client.Client` + :type client: :class:`google.cloud.logging.client.Client` :param client: A client which holds credentials and project configuration for the logger (which requires a project). @@ -64,11 +64,12 @@ def path(self): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current logger. - :rtype: :class:`gcloud.logging.client.Client` + :rtype: :class:`google.cloud.logging.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -78,7 +79,8 @@ def _require_client(self, client): def batch(self, client=None): """Return a batch to use as a context manager. - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current topic. @@ -165,7 +167,8 @@ def log_text(self, text, client=None, labels=None, insert_id=None, :type text: text :param text: the log message. - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current logger. @@ -198,7 +201,8 @@ def log_struct(self, info, client=None, labels=None, insert_id=None, :type info: dict :param info: the log entry information - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current logger. @@ -231,7 +235,8 @@ def log_proto(self, message, client=None, labels=None, insert_id=None, :type message: Protobuf message :param message: the message to be logged - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current logger. @@ -260,7 +265,8 @@ def delete(self, client=None): See: https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.logs/delete - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current logger. """ @@ -283,8 +289,8 @@ def list_entries(self, projects=None, filter_=None, order_by=None, https://cloud.google.com/logging/docs/view/advanced_filters :type order_by: string - :param order_by: One of :data:`gcloud.logging.ASCENDING` or - :data:`gcloud.logging.DESCENDING`. + :param order_by: One of :data:`~google.cloud.logging.client.ASCENDING` + or :data:`~google.cloud.logging.client.DESCENDING`. :type page_size: int :param page_size: maximum number of entries to return, If not passed, @@ -296,7 +302,7 @@ def list_entries(self, projects=None, filter_=None, order_by=None, entries. :rtype: tuple, (list, str) - :returns: list of :class:`gcloud.logging.entry.TextEntry`, plus a + :returns: list of :class:`google.cloud.logging.entry.TextEntry`, plus a "next page token" string: if not None, indicates that more entries can be retrieved with another call (pass that value as ``page_token``). @@ -316,10 +322,10 @@ class Batch(object): Helper returned by :meth:`Logger.batch` - :type logger: :class:`gcloud.logging.logger.Logger` + :type logger: :class:`google.cloud.logging.logger.Logger` :param logger: the logger to which entries will be logged. - :type client: :class:`gcloud.logging.client.Client` + :type client: :class:`google.cloud.logging.client.Client` :param client: The client to use. """ def __init__(self, logger, client): @@ -406,7 +412,8 @@ def log_proto(self, message, labels=None, insert_id=None, severity=None, def commit(self, client=None): """Send saved log entries as a single API call. - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current batch. """ diff --git a/gcloud/logging/metric.py b/google/cloud/logging/metric.py similarity index 86% rename from gcloud/logging/metric.py rename to google/cloud/logging/metric.py index b3a1f282a5fb..91a2b1c09af9 100644 --- a/gcloud/logging/metric.py +++ b/google/cloud/logging/metric.py @@ -14,7 +14,7 @@ """Define Stackdriver Logging API Metrics.""" -from gcloud.exceptions import NotFound +from google.cloud.exceptions import NotFound class Metric(object): @@ -31,7 +31,7 @@ class Metric(object): tracked by the metric. If not passed, the instance should already exist, to be refreshed via :meth:`reload`. - :type client: :class:`gcloud.logging.client.Client` + :type client: :class:`google.cloud.logging.client.Client` :param client: A client which holds credentials and project configuration for the metric (which requires a project). @@ -71,11 +71,11 @@ def from_api_repr(cls, resource, client): :type resource: dict :param resource: metric resource representation returned from the API - :type client: :class:`gcloud.logging.client.Client` + :type client: :class:`google.cloud.logging.client.Client` :param client: Client which holds credentials and project configuration for the metric. - :rtype: :class:`gcloud.logging.metric.Metric` + :rtype: :class:`google.cloud.logging.metric.Metric` :returns: Metric parsed from ``resource``. """ metric_name = resource['name'] @@ -87,11 +87,12 @@ def from_api_repr(cls, resource, client): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current metric. - :rtype: :class:`gcloud.logging.client.Client` + :rtype: :class:`google.cloud.logging.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -104,7 +105,8 @@ def create(self, client=None): See: https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.metrics/create - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current metric. """ @@ -118,7 +120,8 @@ def exists(self, client=None): See https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.metrics/get - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current metric. @@ -140,7 +143,8 @@ def reload(self, client=None): See https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.metrics/get - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current metric. """ @@ -155,7 +159,8 @@ def update(self, client=None): See https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.metrics/update - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current metric. """ @@ -169,7 +174,8 @@ def delete(self, client=None): See https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.metrics/delete - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current metric. """ diff --git a/gcloud/logging/sink.py b/google/cloud/logging/sink.py similarity index 86% rename from gcloud/logging/sink.py rename to google/cloud/logging/sink.py index 9cde122d5851..169793bbd455 100644 --- a/gcloud/logging/sink.py +++ b/google/cloud/logging/sink.py @@ -14,7 +14,7 @@ """Define Stackdriver Logging API Sinks.""" -from gcloud.exceptions import NotFound +from google.cloud.exceptions import NotFound class Sink(object): @@ -36,7 +36,7 @@ class Sink(object): If not passed, the instance should already exist, to be refreshed via :meth:`reload`. - :type client: :class:`gcloud.logging.client.Client` + :type client: :class:`google.cloud.logging.client.Client` :param client: A client which holds credentials and project configuration for the sink (which requires a project). """ @@ -73,11 +73,11 @@ def from_api_repr(cls, resource, client): :type resource: dict :param resource: sink resource representation returned from the API - :type client: :class:`gcloud.logging.client.Client` + :type client: :class:`google.cloud.logging.client.Client` :param client: Client which holds credentials and project configuration for the sink. - :rtype: :class:`gcloud.logging.sink.Sink` + :rtype: :class:`google.cloud.logging.sink.Sink` :returns: Sink parsed from ``resource``. :raises: :class:`ValueError` if ``client`` is not ``None`` and the project from the resource does not agree with the project @@ -91,11 +91,12 @@ def from_api_repr(cls, resource, client): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current sink. - :rtype: :class:`gcloud.logging.client.Client` + :rtype: :class:`google.cloud.logging.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -108,7 +109,8 @@ def create(self, client=None): See: https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.sinks/create - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current sink. """ @@ -122,7 +124,8 @@ def exists(self, client=None): See https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.sinks/get - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current sink. @@ -144,7 +147,8 @@ def reload(self, client=None): See https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.sinks/get - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current sink. """ @@ -159,7 +163,8 @@ def update(self, client=None): See https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.sinks/update - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current sink. """ @@ -173,7 +178,8 @@ def delete(self, client=None): See https://cloud.google.com/logging/docs/api/ref_v2beta1/rest/v2beta1/projects.sinks/delete - :type client: :class:`gcloud.logging.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.logging.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current sink. """ diff --git a/gcloud/monitoring/__init__.py b/google/cloud/monitoring/__init__.py similarity index 52% rename from gcloud/monitoring/__init__.py rename to google/cloud/monitoring/__init__.py index d155c8a492cf..367cb1d5e87b 100644 --- a/gcloud/monitoring/__init__.py +++ b/google/cloud/monitoring/__init__.py @@ -14,22 +14,22 @@ """Google Stackdriver Monitoring API wrapper.""" -from gcloud.monitoring.client import Client -from gcloud.monitoring.connection import Connection -from gcloud.monitoring.group import Group -from gcloud.monitoring.label import LabelDescriptor -from gcloud.monitoring.label import LabelValueType -from gcloud.monitoring.metric import Metric -from gcloud.monitoring.metric import MetricDescriptor -from gcloud.monitoring.metric import MetricKind -from gcloud.monitoring.metric import ValueType -from gcloud.monitoring.query import Aligner -from gcloud.monitoring.query import Query -from gcloud.monitoring.query import Reducer -from gcloud.monitoring.resource import Resource -from gcloud.monitoring.resource import ResourceDescriptor -from gcloud.monitoring.timeseries import Point -from gcloud.monitoring.timeseries import TimeSeries +from google.cloud.monitoring.client import Client +from google.cloud.monitoring.connection import Connection +from google.cloud.monitoring.group import Group +from google.cloud.monitoring.label import LabelDescriptor +from google.cloud.monitoring.label import LabelValueType +from google.cloud.monitoring.metric import Metric +from google.cloud.monitoring.metric import MetricDescriptor +from google.cloud.monitoring.metric import MetricKind +from google.cloud.monitoring.metric import ValueType +from google.cloud.monitoring.query import Aligner +from google.cloud.monitoring.query import Query +from google.cloud.monitoring.query import Reducer +from google.cloud.monitoring.resource import Resource +from google.cloud.monitoring.resource import ResourceDescriptor +from google.cloud.monitoring.timeseries import Point +from google.cloud.monitoring.timeseries import TimeSeries __all__ = ( 'Client', diff --git a/gcloud/monitoring/_dataframe.py b/google/cloud/monitoring/_dataframe.py similarity index 98% rename from gcloud/monitoring/_dataframe.py rename to google/cloud/monitoring/_dataframe.py index 1b5b1944d918..6a0d933935e5 100644 --- a/gcloud/monitoring/_dataframe.py +++ b/google/cloud/monitoring/_dataframe.py @@ -30,7 +30,7 @@ def _build_dataframe(time_series_iterable, """Build a :mod:`pandas` dataframe out of time series. :type time_series_iterable: - iterable over :class:`~gcloud.monitoring.timeseries.TimeSeries` + iterable over :class:`~google.cloud.monitoring.timeseries.TimeSeries` :param time_series_iterable: An iterable (e.g., a query object) yielding time series. diff --git a/gcloud/monitoring/client.py b/google/cloud/monitoring/client.py similarity index 82% rename from gcloud/monitoring/client.py rename to google/cloud/monitoring/client.py index c1a39be8602f..44a7715000a2 100644 --- a/gcloud/monitoring/client.py +++ b/google/cloud/monitoring/client.py @@ -16,7 +16,7 @@ Example:: - >>> from gcloud import monitoring + >>> from google.cloud import monitoring >>> client = monitoring.Client() >>> query = client.query(minutes=5) >>> print(query.as_dataframe()) # Requires pandas. @@ -30,18 +30,18 @@ import datetime -from gcloud.client import JSONClient -from gcloud.monitoring.connection import Connection -from gcloud.monitoring.group import Group -from gcloud.monitoring.metric import Metric -from gcloud.monitoring.metric import MetricDescriptor -from gcloud.monitoring.metric import MetricKind -from gcloud.monitoring.metric import ValueType -from gcloud.monitoring.query import Query -from gcloud.monitoring.resource import Resource -from gcloud.monitoring.resource import ResourceDescriptor -from gcloud.monitoring.timeseries import Point -from gcloud.monitoring.timeseries import TimeSeries +from google.cloud.client import JSONClient +from google.cloud.monitoring.connection import Connection +from google.cloud.monitoring.group import Group +from google.cloud.monitoring.metric import Metric +from google.cloud.monitoring.metric import MetricDescriptor +from google.cloud.monitoring.metric import MetricKind +from google.cloud.monitoring.metric import ValueType +from google.cloud.monitoring.query import Query +from google.cloud.monitoring.resource import Resource +from google.cloud.monitoring.resource import ResourceDescriptor +from google.cloud.monitoring.timeseries import Point +from google.cloud.monitoring.timeseries import TimeSeries _UTCNOW = datetime.datetime.utcnow # To be replaced by tests. @@ -82,7 +82,7 @@ def query(self, :type metric_type: string :param metric_type: The metric type name. The default value is :data:`Query.DEFAULT_METRIC_TYPE - `, + `, but please note that this default value is provided only for demonstration purposes and is subject to change. See the `supported metrics`_. @@ -98,7 +98,7 @@ def query(self, It is also allowed to omit the end time and duration here, in which case - :meth:`~gcloud.monitoring.query.Query.select_interval` + :meth:`~google.cloud.monitoring.query.Query.select_interval` must be called before the query is executed. :type days: integer @@ -110,13 +110,13 @@ def query(self, :type minutes: integer :param minutes: The number of minutes in the time interval. - :rtype: :class:`~gcloud.monitoring.query.Query` + :rtype: :class:`~google.cloud.monitoring.query.Query` :returns: The query object. :raises: :exc:`ValueError` if ``end_time`` is specified but ``days``, ``hours``, and ``minutes`` are all zero. If you really want to specify a point in time, use - :meth:`~gcloud.monitoring.query.Query.select_interval`. + :meth:`~google.cloud.monitoring.query.Query.select_interval`. .. _supported metrics: https://cloud.google.com/monitoring/api/metrics """ @@ -133,7 +133,8 @@ def metric_descriptor(self, type_, Metric descriptors specify the schema for a particular metric type. This factory method is used most often in conjunction with the metric - descriptor :meth:`~gcloud.monitoring.metric.MetricDescriptor.create` + descriptor + :meth:`~google.cloud.monitoring.metric.MetricDescriptor.create` method to define custom metrics:: >>> descriptor = client.metric_descriptor( @@ -166,7 +167,7 @@ def metric_descriptor(self, type_, The kind of measurement. It must be one of :data:`MetricKind.GAUGE`, :data:`MetricKind.DELTA`, or :data:`MetricKind.CUMULATIVE`. - See :class:`~gcloud.monitoring.metric.MetricKind`. + See :class:`~google.cloud.monitoring.metric.MetricKind`. :type value_type: string :param value_type: @@ -176,7 +177,8 @@ def metric_descriptor(self, type_, or :data:`ValueType.DISTRIBUTION`. See :class:`ValueType`. - :type labels: list of :class:`~gcloud.monitoring.label.LabelDescriptor` + :type labels: + list of :class:`~google.cloud.monitoring.label.LabelDescriptor` :param labels: A sequence of zero or more label descriptors specifying the labels used to identify a specific instance of this metric. @@ -207,10 +209,10 @@ def metric_descriptor(self, type_, def metric(type_, labels): """Factory for constructing metric objects. - :class:`~gcloud.monitoring.metric.Metric` objects are typically + :class:`~google.cloud.monitoring.metric.Metric` objects are typically created to write custom metric values. The type should match the metric type specified in the - :class:`~gcloud.monitoring.metric.MetricDescriptor` used to + :class:`~google.cloud.monitoring.metric.MetricDescriptor` used to create the custom metric:: >>> metric = client.metric('custom.googleapis.com/my_metric', @@ -224,9 +226,9 @@ def metric(type_, labels): :type labels: dict :param labels: A mapping from label names to values for all labels enumerated in the associated - :class:`~gcloud.monitoring.metric.MetricDescriptor`. + :class:`~google.cloud.monitoring.metric.MetricDescriptor`. - :rtype: :class:`~gcloud.monitoring.metric.Metric` + :rtype: :class:`~google.cloud.monitoring.metric.Metric` :returns: The metric object. """ return Metric(type=type_, labels=labels) @@ -236,9 +238,9 @@ def resource(type_, labels): """Factory for constructing monitored resource objects. A monitored resource object ( - :class:`~gcloud.monitoring.resource.Resource`) is + :class:`~google.cloud.monitoring.resource.Resource`) is typically used to create a - :class:`~gcloud.monitoring.timeseries.TimeSeries` object. + :class:`~google.cloud.monitoring.timeseries.TimeSeries` object. For a list of possible monitored resource types and their associated labels, see: @@ -251,11 +253,11 @@ def resource(type_, labels): :type labels: dict :param labels: A mapping from label names to values for all labels enumerated in the associated - :class:`~gcloud.monitoring.resource.ResourceDescriptor`, + :class:`~google.cloud.monitoring.resource.ResourceDescriptor`, except that ``project_id`` can and should be omitted when writing time series data. - :rtype: :class:`~gcloud.monitoring.resource.Resource` + :rtype: :class:`~google.cloud.monitoring.resource.Resource` :returns: A monitored resource object. """ return Resource(type_, labels) @@ -267,9 +269,9 @@ def time_series(metric, resource, value, .. note:: - While :class:`~gcloud.monitoring.timeseries.TimeSeries` objects - returned by the API typically have multiple data points, - :class:`~gcloud.monitoring.timeseries.TimeSeries` objects + While :class:`~google.cloud.monitoring.timeseries.TimeSeries` + objects returned by the API typically have multiple data points, + :class:`~google.cloud.monitoring.timeseries.TimeSeries` objects sent to the API must have at most one point. For example:: @@ -281,17 +283,17 @@ def time_series(metric, resource, value, https://cloud.google.com/monitoring/api/ref_v3/rest/v3/TimeSeries - :type metric: :class:`~gcloud.monitoring.metric.Metric` - :param metric: A :class:`~gcloud.monitoring.metric.Metric` object. + :type metric: :class:`~google.cloud.monitoring.metric.Metric` + :param metric: A :class:`~google.cloud.monitoring.metric.Metric`. - :type resource: :class:`~gcloud.monitoring.resource.Resource` - :param resource: A :class:`~gcloud.monitoring.resource.Resource` + :type resource: :class:`~google.cloud.monitoring.resource.Resource` + :param resource: A :class:`~google.cloud.monitoring.resource.Resource` object. :type value: bool, int, string, or float :param value: The value of the data point to create for the - :class:`~gcloud.monitoring.timeseries.TimeSeries`. + :class:`~google.cloud.monitoring.timeseries.TimeSeries`. .. note:: @@ -314,7 +316,7 @@ def time_series(metric, resource, value, Defaults to None. If the start time is unspecified, the API interprets the start time to be the same as the end time. - :rtype: :class:`~gcloud.monitoring.timeseries.TimeSeries` + :rtype: :class:`~google.cloud.monitoring.timeseries.TimeSeries` :returns: A time series object. """ if end_time is None: @@ -334,11 +336,11 @@ def fetch_metric_descriptor(self, metric_type): :type metric_type: string :param metric_type: The metric type name. - :rtype: :class:`~gcloud.monitoring.metric.MetricDescriptor` + :rtype: :class:`~google.cloud.monitoring.metric.MetricDescriptor` :returns: The metric descriptor instance. - :raises: :class:`gcloud.exceptions.NotFound` if the metric descriptor - is not found. + :raises: :class:`google.cloud.exceptions.NotFound` if the metric + descriptor is not found. """ return MetricDescriptor._fetch(self, metric_type) @@ -364,7 +366,8 @@ def list_metric_descriptors(self, filter_string=None, type_prefix=None): metric types. This adds ``metric.type = starts_with("")`` to the filter. - :rtype: list of :class:`~gcloud.monitoring.metric.MetricDescriptor` + :rtype: + list of :class:`~google.cloud.monitoring.metric.MetricDescriptor` :returns: A list of metric descriptor instances. .. _filter documentation: @@ -383,11 +386,11 @@ def fetch_resource_descriptor(self, resource_type): :type resource_type: string :param resource_type: The resource type name. - :rtype: :class:`~gcloud.monitoring.resource.ResourceDescriptor` + :rtype: :class:`~google.cloud.monitoring.resource.ResourceDescriptor` :returns: The resource descriptor instance. - :raises: :class:`gcloud.exceptions.NotFound` if the resource descriptor - is not found. + :raises: :class:`google.cloud.exceptions.NotFound` if the resource + descriptor is not found. """ return ResourceDescriptor._fetch(self, resource_type) @@ -404,7 +407,8 @@ def list_resource_descriptors(self, filter_string=None): An optional filter expression describing the resource descriptors to be returned. See the `filter documentation`_. - :rtype: list of :class:`~gcloud.monitoring.resource.ResourceDescriptor` + :rtype: list of + :class:`~google.cloud.monitoring.resource.ResourceDescriptor` :returns: A list of resource descriptor instances. .. _filter documentation: @@ -465,16 +469,17 @@ def fetch_group(self, group_id): >>> try: >>> group = client.fetch_group('1234') - >>> except gcloud.exceptions.NotFound: + >>> except google.cloud.exceptions.NotFound: >>> print('That group does not exist!') :type group_id: string :param group_id: The ID of the group. - :rtype: :class:`~gcloud.monitoring.group.Group` + :rtype: :class:`~google.cloud.monitoring.group.Group` :returns: The group instance. - :raises: :class:`gcloud.exceptions.NotFound` if the group is not found. + :raises: :class:`google.cloud.exceptions.NotFound` if the group + is not found. """ return Group._fetch(self, group_id) @@ -486,7 +491,7 @@ def list_groups(self): >>> for group in client.list_groups(): ... print((group.display_name, group.name)) - :rtype: list of :class:`~gcloud.monitoring.group.Group` + :rtype: list of :class:`~google.cloud.monitoring.group.Group` :returns: A list of group instances. """ return Group._list(self) diff --git a/gcloud/monitoring/connection.py b/google/cloud/monitoring/connection.py similarity index 97% rename from gcloud/monitoring/connection.py rename to google/cloud/monitoring/connection.py index c9f804e5e77e..35693f8d5f1e 100644 --- a/gcloud/monitoring/connection.py +++ b/google/cloud/monitoring/connection.py @@ -14,7 +14,7 @@ """Create / interact with Stackdriver Monitoring connections.""" -from gcloud import connection as base_connection +from google.cloud import connection as base_connection class Connection(base_connection.JSONConnection): diff --git a/gcloud/monitoring/group.py b/google/cloud/monitoring/group.py similarity index 94% rename from gcloud/monitoring/group.py rename to google/cloud/monitoring/group.py index abeff05fe1e9..c43f4d761388 100644 --- a/gcloud/monitoring/group.py +++ b/google/cloud/monitoring/group.py @@ -21,10 +21,10 @@ import re -from gcloud._helpers import _datetime_to_rfc3339 -from gcloud._helpers import _name_from_project_path -from gcloud.exceptions import NotFound -from gcloud.monitoring.resource import Resource +from google.cloud._helpers import _datetime_to_rfc3339 +from google.cloud._helpers import _name_from_project_path +from google.cloud.exceptions import NotFound +from google.cloud.monitoring.resource import Resource _GROUP_TEMPLATE = re.compile(r""" @@ -73,7 +73,7 @@ def _group_name_from_id(project, group_id): class Group(object): """A dynamic collection of monitored resources. - :type client: :class:`gcloud.monitoring.client.Client` + :type client: :class:`google.cloud.monitoring.client.Client` :param client: A client for operating on the metric descriptor. :type group_id: string or None @@ -242,7 +242,7 @@ def list_children(self): Returns groups whose parent_name field contains the group name. If no groups have this parent, the results are empty. - :rtype: list of :class:`~gcloud.monitoring.group.Group` + :rtype: list of :class:`~google.cloud.monitoring.group.Group` :returns: A list of group instances. """ return self._list(self.client, children_of_group=self.name) @@ -254,7 +254,7 @@ def list_ancestors(self): and ending with the most distant ancestor. If the specified group has no immediate parent, the results are empty. - :rtype: list of :class:`~gcloud.monitoring.group.Group` + :rtype: list of :class:`~google.cloud.monitoring.group.Group` :returns: A list of group instances. """ return self._list(self.client, ancestors_of_group=self.name) @@ -265,7 +265,7 @@ def list_descendants(self): This returns a superset of the results returned by the :meth:`children` method, and includes children-of-children, and so forth. - :rtype: list of :class:`~gcloud.monitoring.group.Group` + :rtype: list of :class:`~google.cloud.monitoring.group.Group` :returns: A list of group instances. """ return self._list(self.client, descendants_of_group=self.name) @@ -313,7 +313,7 @@ def list_members(self, filter_string=None, end_time=None, start_time=None): The start time (exclusive) of the time interval for which results should be returned, as a datetime object. - :rtype: list of :class:`~gcloud.monitoring.resource.Resource` + :rtype: list of :class:`~google.cloud.monitoring.resource.Resource` :returns: A list of resource instances. :raises: @@ -362,7 +362,7 @@ def list_members(self, filter_string=None, end_time=None, start_time=None): def _fetch(cls, client, group_id): """Fetch a group from the API based on it's ID. - :type client: :class:`gcloud.monitoring.client.Client` + :type client: :class:`google.cloud.monitoring.client.Client` :param client: The client to use. :type group_id: string @@ -371,7 +371,7 @@ def _fetch(cls, client, group_id): :rtype: :class:`Group` :returns: The group instance. - :raises: :class:`gcloud.exceptions.NotFound` if the group + :raises: :class:`google.cloud.exceptions.NotFound` if the group is not found. """ new_group = cls(client, group_id) @@ -383,7 +383,7 @@ def _list(cls, client, children_of_group=None, ancestors_of_group=None, descendants_of_group=None): """Lists all groups in the project. - :type client: :class:`gcloud.monitoring.client.Client` + :type client: :class:`google.cloud.monitoring.client.Client` :param client: The client to use. :type children_of_group: string or None @@ -402,7 +402,7 @@ def _list(cls, client, children_of_group=None, ancestors_of_group=None, of the results returned by the children_of_group filter, and includes children-of-children, and so forth. - :rtype: list of :class:`~gcloud.monitoring.group.Group` + :rtype: list of :class:`~google.cloud.monitoring.group.Group` :returns: A list of group instances. """ path = '/projects/%s/groups/' % (client.project,) @@ -438,7 +438,7 @@ def _list(cls, client, children_of_group=None, ancestors_of_group=None, def _from_dict(cls, client, info): """Constructs a Group instance from the parsed JSON representation. - :type client: :class:`gcloud.monitoring.client.Client` + :type client: :class:`google.cloud.monitoring.client.Client` :param client: A client to be included in the returned object. :type info: dict diff --git a/gcloud/monitoring/label.py b/google/cloud/monitoring/label.py similarity index 100% rename from gcloud/monitoring/label.py rename to google/cloud/monitoring/label.py diff --git a/gcloud/monitoring/metric.py b/google/cloud/monitoring/metric.py similarity index 93% rename from gcloud/monitoring/metric.py rename to google/cloud/monitoring/metric.py index da162479100d..bd31719f37bb 100644 --- a/gcloud/monitoring/metric.py +++ b/google/cloud/monitoring/metric.py @@ -21,7 +21,7 @@ import collections -from gcloud.monitoring.label import LabelDescriptor +from google.cloud.monitoring.label import LabelDescriptor class MetricKind(object): @@ -62,10 +62,10 @@ class MetricDescriptor(object): """Specification of a metric type and its schema. The preferred way to construct a metric descriptor object is using the - :meth:`~gcloud.monitoring.client.Client.metric_descriptor` factory method - of the :class:`~gcloud.monitoring.client.Client` class. + :meth:`~google.cloud.monitoring.client.Client.metric_descriptor` factory + method of the :class:`~google.cloud.monitoring.client.Client` class. - :type client: :class:`gcloud.monitoring.client.Client` + :type client: :class:`google.cloud.monitoring.client.Client` :param client: A client for operating on the metric descriptor. :type type_: string @@ -87,7 +87,8 @@ class MetricDescriptor(object): or :data:`ValueType.DISTRIBUTION`. See :class:`ValueType`. - :type labels: list of :class:`~gcloud.monitoring.label.LabelDescriptor` + :type labels: + list of :class:`~google.cloud.monitoring.label.LabelDescriptor` :param labels: A sequence of zero or more label descriptors specifying the labels used to identify a specific instance of this metric. @@ -172,7 +173,7 @@ def delete(self): def _fetch(cls, client, metric_type): """Look up a metric descriptor by type. - :type client: :class:`gcloud.monitoring.client.Client` + :type client: :class:`google.cloud.monitoring.client.Client` :param client: The client to use. :type metric_type: string @@ -181,8 +182,8 @@ def _fetch(cls, client, metric_type): :rtype: :class:`MetricDescriptor` :returns: The metric descriptor instance. - :raises: :class:`gcloud.exceptions.NotFound` if the metric descriptor - is not found. + :raises: :class:`google.cloud.exceptions.NotFound` if the metric + descriptor is not found. """ path = '/projects/{project}/metricDescriptors/{type}'.format( project=client.project, @@ -194,7 +195,7 @@ def _fetch(cls, client, metric_type): def _list(cls, client, filter_string=None, type_prefix=None): """List all metric descriptors for the project. - :type client: :class:`gcloud.monitoring.client.Client` + :type client: :class:`google.cloud.monitoring.client.Client` :param client: The client to use. :type filter_string: string or None @@ -250,7 +251,7 @@ def _list(cls, client, filter_string=None, type_prefix=None): def _from_dict(cls, client, info): """Construct a metric descriptor from the parsed JSON representation. - :type client: :class:`gcloud.monitoring.client.Client` + :type client: :class:`google.cloud.monitoring.client.Client` :param client: A client to be included in the returned object. :type info: dict @@ -320,8 +321,8 @@ class Metric(collections.namedtuple('Metric', 'type labels')): """A specific metric identified by specifying values for all labels. The preferred way to construct a metric object is using the - :meth:`~gcloud.monitoring.client.Client.metric` factory method - of the :class:`~gcloud.monitoring.client.Client` class. + :meth:`~google.cloud.monitoring.client.Client.metric` factory method + of the :class:`~google.cloud.monitoring.client.Client` class. :type type: string :param type: The metric type name. diff --git a/gcloud/monitoring/query.py b/google/cloud/monitoring/query.py similarity index 97% rename from gcloud/monitoring/query.py rename to google/cloud/monitoring/query.py index db00167f282e..d9176b15f562 100644 --- a/gcloud/monitoring/query.py +++ b/google/cloud/monitoring/query.py @@ -25,9 +25,9 @@ import six -from gcloud._helpers import _datetime_to_rfc3339 -from gcloud.monitoring._dataframe import _build_dataframe -from gcloud.monitoring.timeseries import TimeSeries +from google.cloud._helpers import _datetime_to_rfc3339 +from google.cloud.monitoring._dataframe import _build_dataframe +from google.cloud.monitoring.timeseries import TimeSeries _UTCNOW = datetime.datetime.utcnow # To be replaced by tests. @@ -72,16 +72,16 @@ class Query(object): """Query object for retrieving metric data. The preferred way to construct a query object is using the - :meth:`~gcloud.monitoring.client.Client.query` method - of the :class:`~gcloud.monitoring.client.Client` class. + :meth:`~google.cloud.monitoring.client.Client.query` method + of the :class:`~google.cloud.monitoring.client.Client` class. - :type client: :class:`gcloud.monitoring.client.Client` + :type client: :class:`google.cloud.monitoring.client.Client` :param client: The client to use. :type metric_type: string :param metric_type: The metric type name. The default value is :data:`Query.DEFAULT_METRIC_TYPE - `, + `, but please note that this default value is provided only for demonstration purposes and is subject to change. See the `supported metrics`_. @@ -97,7 +97,7 @@ class Query(object): It is also allowed to omit the end time and duration here, in which case - :meth:`~gcloud.monitoring.query.Query.select_interval` + :meth:`~google.cloud.monitoring.query.Query.select_interval` must be called before the query is executed. :type days: integer @@ -112,7 +112,7 @@ class Query(object): :raises: :exc:`ValueError` if ``end_time`` is specified but ``days``, ``hours``, and ``minutes`` are all zero. If you really want to specify a point in time, use - :meth:`~gcloud.monitoring.query.Query.select_interval`. + :meth:`~google.cloud.monitoring.query.Query.select_interval`. .. _supported metrics: https://cloud.google.com/monitoring/api/metrics """ @@ -430,7 +430,7 @@ def iter(self, headers_only=False, page_size=None): """Yield all time series objects selected by the query. The generator returned iterates over - :class:`~gcloud.monitoring.timeseries.TimeSeries` objects + :class:`~google.cloud.monitoring.timeseries.TimeSeries` objects containing points ordered from oldest to newest. Note that the :class:`Query` object itself is an iterable, such that @@ -508,7 +508,7 @@ def _build_query_params(self, headers_only=False, :type headers_only: boolean :param headers_only: Whether to omit the point data from the - :class:`~gcloud.monitoring.timeseries.TimeSeries` objects. + :class:`~google.cloud.monitoring.timeseries.TimeSeries` objects. :type page_size: integer or None :param page_size: A limit on the number of points to return per page. diff --git a/gcloud/monitoring/resource.py b/google/cloud/monitoring/resource.py similarity index 91% rename from gcloud/monitoring/resource.py rename to google/cloud/monitoring/resource.py index 09504a99bc23..6d3c687cbf8b 100644 --- a/gcloud/monitoring/resource.py +++ b/google/cloud/monitoring/resource.py @@ -22,7 +22,7 @@ import collections -from gcloud.monitoring.label import LabelDescriptor +from google.cloud.monitoring.label import LabelDescriptor class ResourceDescriptor(object): @@ -45,7 +45,8 @@ class ResourceDescriptor(object): :param description: A detailed description that might be used in documentation. - :type labels: list of :class:`~gcloud.monitoring.label.LabelDescriptor` + :type labels: + list of :class:`~google.cloud.monitoring.label.LabelDescriptor` :param labels: A sequence of label descriptors specifying the labels used to identify a specific instance of this monitored resource. @@ -62,7 +63,7 @@ def __init__(self, name, type_, display_name, description, labels): def _fetch(cls, client, resource_type): """Look up a monitored resource descriptor by type. - :type client: :class:`gcloud.monitoring.client.Client` + :type client: :class:`google.cloud.monitoring.client.Client` :param client: The client to use. :type resource_type: string @@ -71,8 +72,8 @@ def _fetch(cls, client, resource_type): :rtype: :class:`ResourceDescriptor` :returns: The resource descriptor instance. - :raises: :class:`gcloud.exceptions.NotFound` if the resource descriptor - is not found. + :raises: :class:`google.cloud.exceptions.NotFound` if the resource + descriptor is not found. """ path = ('/projects/{project}/monitoredResourceDescriptors/{type}' .format(project=client.project, @@ -84,7 +85,7 @@ def _fetch(cls, client, resource_type): def _list(cls, client, filter_string=None): """List all monitored resource descriptors for the project. - :type client: :class:`gcloud.monitoring.client.Client` + :type client: :class:`google.cloud.monitoring.client.Client` :param client: The client to use. :type filter_string: string or None @@ -159,8 +160,8 @@ class Resource(collections.namedtuple('Resource', 'type labels')): """A monitored resource identified by specifying values for all labels. The preferred way to construct a resource object is using the - :meth:`~gcloud.monitoring.client.Client.resource` factory method - of the :class:`~gcloud.monitoring.client.Client` class. + :meth:`~google.cloud.monitoring.client.Client.resource` factory method + of the :class:`~google.cloud.monitoring.client.Client` class. :type type: string :param type: The resource type name. diff --git a/gcloud/monitoring/timeseries.py b/google/cloud/monitoring/timeseries.py similarity index 88% rename from gcloud/monitoring/timeseries.py rename to google/cloud/monitoring/timeseries.py index 2020765e4bf8..64e2443dcbf6 100644 --- a/gcloud/monitoring/timeseries.py +++ b/google/cloud/monitoring/timeseries.py @@ -24,8 +24,8 @@ import collections -from gcloud.monitoring.metric import Metric -from gcloud.monitoring.resource import Resource +from google.cloud.monitoring.metric import Metric +from google.cloud.monitoring.resource import Resource class TimeSeries(collections.namedtuple( @@ -33,28 +33,29 @@ class TimeSeries(collections.namedtuple( """A single time series of metric values. The preferred way to construct a - :class:`~gcloud.monitoring.timeseries.TimeSeries` object is - using the :meth:`~gcloud.monitoring.client.Client.time_series` factory - method of the :class:`~gcloud.monitoring.client.Client` class. + :class:`~google.cloud.monitoring.timeseries.TimeSeries` object is + using the :meth:`~google.cloud.monitoring.client.Client.time_series` + factory method of the :class:`~google.cloud.monitoring.client.Client` + class. - :type metric: :class:`~gcloud.monitoring.metric.Metric` + :type metric: :class:`~google.cloud.monitoring.metric.Metric` :param metric: A metric object. - :type resource: :class:`~gcloud.monitoring.resource.Resource` + :type resource: :class:`~google.cloud.monitoring.resource.Resource` :param resource: A resource object. :type metric_kind: string :param metric_kind: The kind of measurement: :data:`MetricKind.GAUGE`, :data:`MetricKind.DELTA`, or :data:`MetricKind.CUMULATIVE`. - See :class:`~gcloud.monitoring.metric.MetricKind`. + See :class:`~google.cloud.monitoring.metric.MetricKind`. :type value_type: string :param value_type: The value type of the metric: :data:`ValueType.BOOL`, :data:`ValueType.INT64`, :data:`ValueType.DOUBLE`, :data:`ValueType.STRING`, or :data:`ValueType.DISTRIBUTION`. - See :class:`~gcloud.monitoring.metric.ValueType`. + See :class:`~google.cloud.monitoring.metric.ValueType`. :type points: list of :class:`Point` :param points: A list of point objects. diff --git a/gcloud/operation.py b/google/cloud/operation.py similarity index 100% rename from gcloud/operation.py rename to google/cloud/operation.py diff --git a/gcloud/pubsub/__init__.py b/google/cloud/pubsub/__init__.py similarity index 64% rename from gcloud/pubsub/__init__.py rename to google/cloud/pubsub/__init__.py index b9439548a705..16e8df626462 100644 --- a/gcloud/pubsub/__init__.py +++ b/google/cloud/pubsub/__init__.py @@ -16,17 +16,16 @@ The main concepts with this API are: -- :class:`gcloud.pubsub.topic.Topic` represents an endpoint to which messages - can be published using the Cloud Storage Pubsub API. +- :class:`~google.cloud.pubsub.topic.Topic` represents an endpoint to which + messages can be published using the Cloud Storage Pubsub API. -- :class:`gcloud.pubsub.subscription.Subscription` represents a named +- :class:`~google.cloud.pubsub.subscription.Subscription` represents a named subscription (either pull or push) to a topic. """ -from gcloud.pubsub.client import Client -from gcloud.pubsub.connection import Connection -from gcloud.pubsub.subscription import Subscription -from gcloud.pubsub.topic import Topic - - -SCOPE = Connection.SCOPE +try: + import pkg_resources + pkg_resources.declare_namespace(__name__) +except ImportError: + import pkgutil + __path__ = pkgutil.extend_path(__path__, __name__) diff --git a/gcloud/pubsub/_gax.py b/google/cloud/pubsub/_gax.py similarity index 97% rename from gcloud/pubsub/_gax.py rename to google/cloud/pubsub/_gax.py index 554bdc365dd4..eaafcc263faf 100644 --- a/gcloud/pubsub/_gax.py +++ b/google/cloud/pubsub/_gax.py @@ -21,10 +21,12 @@ from google.pubsub.v1.pubsub_pb2 import PushConfig from grpc import StatusCode -from gcloud._helpers import _to_bytes -from gcloud._helpers import exc_to_code -from gcloud.exceptions import Conflict -from gcloud.exceptions import NotFound +# pylint: disable=ungrouped-imports +from google.cloud._helpers import _to_bytes +from google.cloud._helpers import exc_to_code +from google.cloud.exceptions import Conflict +from google.cloud.exceptions import NotFound +# pylint: enable=ungrouped-imports class _PublisherAPI(object): @@ -82,7 +84,7 @@ def topic_create(self, topic_path): :rtype: dict :returns: ``Topic`` resource returned from the API. - :raises: :exc:`gcloud.exceptions.Conflict` if the topic already + :raises: :exc:`google.cloud.exceptions.Conflict` if the topic already exists """ try: @@ -105,7 +107,7 @@ def topic_get(self, topic_path): :rtype: dict :returns: ``Topic`` resource returned from the API. - :raises: :exc:`gcloud.exceptions.NotFound` if the topic does not + :raises: :exc:`google.cloud.exceptions.NotFound` if the topic does not exist """ try: @@ -148,7 +150,7 @@ def topic_publish(self, topic_path, messages): :rtype: list of string :returns: list of opaque IDs for published messages. - :raises: :exc:`gcloud.exceptions.NotFound` if the topic does not + :raises: :exc:`google.cloud.exceptions.NotFound` if the topic does not exist """ options = CallOptions(is_bundling=False) @@ -186,7 +188,7 @@ def topic_list_subscriptions(self, topic_path, page_size=0, :rtype: list of strings :returns: fully-qualified names of subscriptions for the supplied topic. - :raises: :exc:`gcloud.exceptions.NotFound` if the topic does not + :raises: :exc:`google.cloud.exceptions.NotFound` if the topic does not exist """ if page_token is None: diff --git a/gcloud/pubsub/_helpers.py b/google/cloud/pubsub/_helpers.py similarity index 97% rename from gcloud/pubsub/_helpers.py rename to google/cloud/pubsub/_helpers.py index 7b87e73e0355..6aff209195c5 100644 --- a/gcloud/pubsub/_helpers.py +++ b/google/cloud/pubsub/_helpers.py @@ -16,7 +16,7 @@ import re -from gcloud._helpers import _name_from_project_path +from google.cloud._helpers import _name_from_project_path _TOPIC_TEMPLATE = re.compile(r""" diff --git a/gcloud/pubsub/client.py b/google/cloud/pubsub/client.py similarity index 89% rename from gcloud/pubsub/client.py rename to google/cloud/pubsub/client.py index eb6e808872f0..9964bc9029d4 100644 --- a/gcloud/pubsub/client.py +++ b/google/cloud/pubsub/client.py @@ -16,13 +16,13 @@ import os -from gcloud.client import JSONClient -from gcloud.pubsub.connection import Connection -from gcloud.pubsub.connection import _PublisherAPI as JSONPublisherAPI -from gcloud.pubsub.connection import _SubscriberAPI as JSONSubscriberAPI -from gcloud.pubsub.connection import _IAMPolicyAPI -from gcloud.pubsub.subscription import Subscription -from gcloud.pubsub.topic import Topic +from google.cloud.client import JSONClient +from google.cloud.pubsub.connection import Connection +from google.cloud.pubsub.connection import _PublisherAPI as JSONPublisherAPI +from google.cloud.pubsub.connection import _SubscriberAPI as JSONSubscriberAPI +from google.cloud.pubsub.connection import _IAMPolicyAPI +from google.cloud.pubsub.subscription import Subscription +from google.cloud.pubsub.topic import Topic # pylint: disable=ungrouped-imports try: @@ -30,8 +30,8 @@ PublisherApi as GeneratedPublisherAPI) from google.cloud.pubsub.v1.subscriber_api import ( SubscriberApi as GeneratedSubscriberAPI) - from gcloud.pubsub._gax import _PublisherAPI as GAXPublisherAPI - from gcloud.pubsub._gax import _SubscriberAPI as GAXSubscriberAPI + from google.cloud.pubsub._gax import _PublisherAPI as GAXPublisherAPI + from google.cloud.pubsub._gax import _SubscriberAPI as GAXSubscriberAPI except ImportError: # pragma: NO COVER _HAVE_GAX = False GeneratedPublisherAPI = GAXPublisherAPI = None @@ -41,7 +41,7 @@ # pylint: enable=ungrouped-imports -_DISABLE_GAX = os.getenv('GCLOUD_DISABLE_GAX', False) +_DISABLE_GAX = os.getenv('GOOGLE_CLOUD_DISABLE_GAX', False) _USE_GAX = _HAVE_GAX and not _DISABLE_GAX @@ -120,7 +120,7 @@ def list_topics(self, page_size=None, page_token=None): topics. :rtype: tuple, (list, str) - :returns: list of :class:`gcloud.pubsub.topic.Topic`, plus a + :returns: list of :class:`google.cloud.pubsub.topic.Topic`, plus a "next page token" string: if not None, indicates that more topics can be retrieved with another call (pass that value as ``page_token``). @@ -154,7 +154,7 @@ def list_subscriptions(self, page_size=None, page_token=None): topics. :rtype: tuple, (list, str) - :returns: list of :class:`gcloud.pubsub.subscription.Subscription`, + :returns: list of :class:`~.pubsub.subscription.Subscription`, plus a "next page token" string: if not None, indicates that more topics can be retrieved with another call (pass that value as ``page_token``). @@ -183,7 +183,7 @@ def topic(self, name, timestamp_messages=False): :type timestamp_messages: boolean :param timestamp_messages: To be passed to ``Topic`` constructor. - :rtype: :class:`gcloud.pubsub.topic.Topic` + :rtype: :class:`google.cloud.pubsub.topic.Topic` :returns: Topic created with the current client. """ return Topic(name, client=self, timestamp_messages=timestamp_messages) diff --git a/gcloud/pubsub/connection.py b/google/cloud/pubsub/connection.py similarity index 99% rename from gcloud/pubsub/connection.py rename to google/cloud/pubsub/connection.py index 292d99cdbf53..df00ea8031bd 100644 --- a/gcloud/pubsub/connection.py +++ b/google/cloud/pubsub/connection.py @@ -12,12 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Create / interact with gcloud pubsub connections.""" +"""Create / interact with Google Cloud Pub/Sub connections.""" import os -from gcloud import connection as base_connection -from gcloud.environment_vars import PUBSUB_EMULATOR +from google.cloud import connection as base_connection +from google.cloud.environment_vars import PUBSUB_EMULATOR class Connection(base_connection.JSONConnection): diff --git a/gcloud/pubsub/iam.py b/google/cloud/pubsub/iam.py similarity index 100% rename from gcloud/pubsub/iam.py rename to google/cloud/pubsub/iam.py diff --git a/gcloud/pubsub/message.py b/google/cloud/pubsub/message.py similarity index 98% rename from gcloud/pubsub/message.py rename to google/cloud/pubsub/message.py index abac699567ae..d1e3c83b4aaa 100644 --- a/gcloud/pubsub/message.py +++ b/google/cloud/pubsub/message.py @@ -16,7 +16,7 @@ import base64 -from gcloud._helpers import _rfc3339_to_datetime +from google.cloud._helpers import _rfc3339_to_datetime class Message(object): diff --git a/gcloud/pubsub/subscription.py b/google/cloud/pubsub/subscription.py similarity index 88% rename from gcloud/pubsub/subscription.py rename to google/cloud/pubsub/subscription.py index 9d520a502628..82335d54181d 100644 --- a/gcloud/pubsub/subscription.py +++ b/google/cloud/pubsub/subscription.py @@ -14,10 +14,10 @@ """Define API Subscriptions.""" -from gcloud.exceptions import NotFound -from gcloud.pubsub._helpers import topic_name_from_path -from gcloud.pubsub.iam import Policy -from gcloud.pubsub.message import Message +from google.cloud.exceptions import NotFound +from google.cloud.pubsub._helpers import topic_name_from_path +from google.cloud.pubsub.iam import Policy +from google.cloud.pubsub.message import Message class Subscription(object): @@ -29,7 +29,7 @@ class Subscription(object): :type name: string :param name: the name of the subscription. - :type topic: :class:`gcloud.pubsub.topic.Topic` or ``NoneType`` + :type topic: :class:`google.cloud.pubsub.topic.Topic` or ``NoneType`` :param topic: the topic to which the subscription belongs; if ``None``, the subscription's topic has been deleted. @@ -41,7 +41,8 @@ class Subscription(object): :param push_endpoint: URL to which messages will be pushed by the back-end. If not set, the application must pull messages. - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the topic. """ @@ -76,7 +77,7 @@ def from_api_repr(cls, resource, client, topics=None): :type resource: dict :param resource: topic resource representation returned from the API. - :type client: :class:`gcloud.pubsub.client.Client` + :type client: :class:`google.cloud.pubsub.client.Client` :param client: Client which holds credentials and project configuration for a topic. @@ -84,7 +85,7 @@ def from_api_repr(cls, resource, client, topics=None): :param topics: A mapping of topic names -> topics. If not passed, the subscription will have a newly-created topic. - :rtype: :class:`gcloud.pubsub.subscription.Subscription` + :rtype: :class:`google.cloud.pubsub.subscription.Subscription` :returns: Subscription parsed from ``resource``. """ if topics is None: @@ -132,7 +133,8 @@ def auto_ack(self, return_immediately=False, max_messages=1, client=None): :type max_messages: int :param max_messages: passed through to :meth:`Subscription.pull` - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: passed through to :meth:`Subscription.pull` and :meth:`Subscription.acknowledge`. @@ -144,12 +146,13 @@ def auto_ack(self, return_immediately=False, max_messages=1, client=None): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the topic of the current subscription. - :rtype: :class:`gcloud.pubsub.client.Client` + :rtype: :class:`google.cloud.pubsub.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -168,7 +171,8 @@ def create(self, client=None): :start-after: [START subscription_create] :end-before: [END subscription_create] - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current subscription's topic. """ @@ -190,7 +194,8 @@ def exists(self, client=None): :start-after: [START subscription_exists] :end-before: [END subscription_exists] - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current subscription's topic. @@ -218,7 +223,8 @@ def reload(self, client=None): :start-after: [START subscription_reload] :end-before: [END subscription_reload] - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current subscription's topic. """ @@ -241,7 +247,8 @@ def delete(self, client=None): :start-after: [START subscription_delete] :end-before: [END subscription_delete] - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current subscription's topic. """ @@ -270,7 +277,8 @@ def modify_push_configuration(self, push_endpoint, client=None): back-end. If None, the application must pull messages. - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current subscription's topic. """ @@ -300,14 +308,16 @@ def pull(self, return_immediately=False, max_messages=1, client=None): :type max_messages: int :param max_messages: the maximum number of messages to return. - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current subscription's topic. :rtype: list of (ack_id, message) tuples :returns: sequence of tuples: ``ack_id`` is the ID to be used in a subsequent call to :meth:`acknowledge`, and ``message`` - is an instance of :class:`gcloud.pubsub.message.Message`. + is an instance of + :class:`~google.cloud.pubsub.message.Message`. """ client = self._require_client(client) api = client.subscriber_api @@ -331,7 +341,8 @@ def acknowledge(self, ack_ids, client=None): :type ack_ids: list of string :param ack_ids: ack IDs of messages being acknowledged - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current subscription's topic. """ @@ -351,7 +362,8 @@ def modify_ack_deadline(self, ack_ids, ack_deadline, client=None): :type ack_deadline: int :param ack_deadline: new deadline for the message, in seconds - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current subscription's topic. """ @@ -372,11 +384,12 @@ def get_iam_policy(self, client=None): :start-after: [START subscription_get_iam_policy] :end-before: [END subscription_get_iam_policy] - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current subscription's topic. - :rtype: :class:`gcloud.pubsub.iam.Policy` + :rtype: :class:`google.cloud.pubsub.iam.Policy` :returns: policy created from the resource returned by the ``getIamPolicy`` API request. """ @@ -397,15 +410,16 @@ def set_iam_policy(self, policy, client=None): :start-after: [START subscription_set_iam_policy] :end-before: [END subscription_set_iam_policy] - :type policy: :class:`gcloud.pubsub.iam.Policy` + :type policy: :class:`google.cloud.pubsub.iam.Policy` :param policy: the new policy, typically fetched via :meth:`get_iam_policy` and updated in place. - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current subscription's topic. - :rtype: :class:`gcloud.pubsub.iam.Policy` + :rtype: :class:`google.cloud.pubsub.iam.Policy` :returns: updated policy created from the resource returned by the ``setIamPolicy`` API request. """ @@ -430,7 +444,8 @@ def check_iam_permissions(self, permissions, client=None): :type permissions: list of string :param permissions: list of permissions to be tested - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current subscription's topic. @@ -471,7 +486,8 @@ class AutoAck(dict): :type max_messages: int :param max_messages: passed through to :meth:`Subscription.pull` - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: passed through to :meth:`Subscription.pull` and :meth:`Subscription.acknowledge`. """ diff --git a/gcloud/pubsub/topic.py b/google/cloud/pubsub/topic.py similarity index 87% rename from gcloud/pubsub/topic.py rename to google/cloud/pubsub/topic.py index c0706649c735..7ed6b485175d 100644 --- a/gcloud/pubsub/topic.py +++ b/google/cloud/pubsub/topic.py @@ -16,13 +16,13 @@ import base64 -from gcloud._helpers import _datetime_to_rfc3339 -from gcloud._helpers import _NOW -from gcloud.exceptions import NotFound -from gcloud.pubsub._helpers import subscription_name_from_path -from gcloud.pubsub._helpers import topic_name_from_path -from gcloud.pubsub.iam import Policy -from gcloud.pubsub.subscription import Subscription +from google.cloud._helpers import _datetime_to_rfc3339 +from google.cloud._helpers import _NOW +from google.cloud.exceptions import NotFound +from google.cloud.pubsub._helpers import subscription_name_from_path +from google.cloud.pubsub._helpers import topic_name_from_path +from google.cloud.pubsub.iam import Policy +from google.cloud.pubsub.subscription import Subscription class Topic(object): @@ -36,7 +36,7 @@ class Topic(object): :type name: string :param name: the name of the topic - :type client: :class:`gcloud.pubsub.client.Client` + :type client: :class:`google.cloud.pubsub.client.Client` :param client: A client which holds credentials and project configuration for the topic (which requires a project). @@ -96,11 +96,11 @@ def from_api_repr(cls, resource, client): :type resource: dict :param resource: topic resource representation returned from the API - :type client: :class:`gcloud.pubsub.client.Client` + :type client: :class:`google.cloud.pubsub.client.Client` :param client: Client which holds credentials and project configuration for the topic. - :rtype: :class:`gcloud.pubsub.topic.Topic` + :rtype: :class:`google.cloud.pubsub.topic.Topic` :returns: Topic parsed from ``resource``. :raises: :class:`ValueError` if ``client`` is not ``None`` and the project from the resource does not agree with the project @@ -122,11 +122,12 @@ def full_name(self): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current topic. - :rtype: :class:`gcloud.pubsub.client.Client` + :rtype: :class:`google.cloud.pubsub.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -145,7 +146,8 @@ def create(self, client=None): :start-after: [START topic_create] :end-before: [END topic_create] - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current topic. """ @@ -165,7 +167,8 @@ def exists(self, client=None): :start-after: [START topic_exists] :end-before: [END topic_exists] - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current topic. @@ -194,7 +197,8 @@ def delete(self, client=None): :start-after: [START topic_delete] :end-before: [END topic_delete] - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current topic. """ @@ -233,7 +237,8 @@ def publish(self, message, client=None, **attrs): :type message: bytes :param message: the message payload - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current topic. @@ -267,7 +272,8 @@ def batch(self, client=None): used as a context manager, and only if the block exits without raising an exception. - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current topic. @@ -298,12 +304,13 @@ def list_subscriptions(self, page_size=None, page_token=None, client=None): passed, the API will return the first page of topics. - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current topic. :rtype: tuple, (list, str) - :returns: list of :class:`gcloud.pubsub.subscription.Subscription`, + :returns: list of :class:`~.pubsub.subscription.Subscription`, plus a "next page token" string: if not None, indicates that more topics can be retrieved with another call (pass that value as ``page_token``). @@ -330,11 +337,12 @@ def get_iam_policy(self, client=None): :start-after: [START topic_get_iam_policy] :end-before: [END topic_get_iam_policy] - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current batch. - :rtype: :class:`gcloud.pubsub.iam.Policy` + :rtype: :class:`google.cloud.pubsub.iam.Policy` :returns: policy created from the resource returned by the ``getIamPolicy`` API request. """ @@ -355,15 +363,16 @@ def set_iam_policy(self, policy, client=None): :start-after: [START topic_set_iam_policy] :end-before: [END topic_set_iam_policy] - :type policy: :class:`gcloud.pubsub.iam.Policy` + :type policy: :class:`google.cloud.pubsub.iam.Policy` :param policy: the new policy, typically fetched via :meth:`get_iam_policy` and updated in place. - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current batch. - :rtype: :class:`gcloud.pubsub.iam.Policy` + :rtype: :class:`google.cloud.pubsub.iam.Policy` :returns: updated policy created from the resource returned by the ``setIamPolicy`` API request. """ @@ -388,7 +397,8 @@ def check_iam_permissions(self, permissions, client=None): :type permissions: list of string :param permissions: list of permissions to be tested - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current batch. @@ -406,10 +416,10 @@ class Batch(object): Helper returned by :meth:Topic.batch - :type topic: :class:`gcloud.pubsub.topic.Topic` + :type topic: :class:`google.cloud.pubsub.topic.Topic` :param topic: the topic being published - :type client: :class:`gcloud.pubsub.client.Client` + :type client: :class:`google.cloud.pubsub.client.Client` :param client: The client to use. """ def __init__(self, topic, client): @@ -445,7 +455,8 @@ def publish(self, message, **attrs): def commit(self, client=None): """Send saved messages as a single API call. - :type client: :class:`gcloud.pubsub.client.Client` or ``NoneType`` + :type client: :class:`~google.cloud.pubsub.client.Client` or + ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current batch. """ diff --git a/gcloud/resource_manager/__init__.py b/google/cloud/resource_manager/__init__.py similarity index 79% rename from gcloud/resource_manager/__init__.py rename to google/cloud/resource_manager/__init__.py index 25089c3854c4..4d6a4c6dfe29 100644 --- a/gcloud/resource_manager/__init__.py +++ b/google/cloud/resource_manager/__init__.py @@ -14,9 +14,10 @@ """Google Cloud Resource Manager API wrapper.""" -from gcloud.resource_manager.client import Client -from gcloud.resource_manager.connection import Connection -from gcloud.resource_manager.project import Project + +from google.cloud.resource_manager.client import Client +from google.cloud.resource_manager.connection import Connection +from google.cloud.resource_manager.project import Project SCOPE = Connection.SCOPE diff --git a/gcloud/resource_manager/client.py b/google/cloud/resource_manager/client.py similarity index 90% rename from gcloud/resource_manager/client.py rename to google/cloud/resource_manager/client.py index a2e881a1924d..95e1224c3384 100644 --- a/gcloud/resource_manager/client.py +++ b/google/cloud/resource_manager/client.py @@ -15,10 +15,10 @@ """A Client for interacting with the Resource Manager API.""" -from gcloud.client import Client as BaseClient -from gcloud.iterator import Iterator -from gcloud.resource_manager.connection import Connection -from gcloud.resource_manager.project import Project +from google.cloud.client import Client as BaseClient +from google.cloud.iterator import Iterator +from google.cloud.resource_manager.connection import Connection +from google.cloud.resource_manager.project import Project class Client(BaseClient): @@ -30,7 +30,7 @@ class Client(BaseClient): Automatically get credentials:: - >>> from gcloud import resource_manager + >>> from google.cloud import resource_manager >>> client = resource_manager.Client() :type credentials: :class:`oauth2client.client.OAuth2Credentials` or @@ -52,7 +52,7 @@ def new_project(self, project_id, name=None, labels=None): """Create a :class:`.Project` bound to the current client. Use :meth:`Project.reload() \ - ` to retrieve + ` to retrieve project metadata after creating a :class:`.Project` instance. .. note: @@ -81,7 +81,7 @@ def fetch_project(self, project_id): .. note:: If the project does not exist, this will raise a - :class:`NotFound ` error. + :class:`NotFound ` error. :type project_id: str :param project_id: The ID for this project. @@ -98,7 +98,7 @@ def list_projects(self, filter_params=None, page_size=None): Example:: - >>> from gcloud import resource_manager + >>> from google.cloud import resource_manager >>> client = resource_manager.Client() >>> for project in client.list_projects(): ... print project.project_id @@ -106,7 +106,7 @@ def list_projects(self, filter_params=None, page_size=None): List all projects with label ``'environment'`` set to ``'prod'`` (filtering by labels):: - >>> from gcloud import resource_manager + >>> from google.cloud import resource_manager >>> client = resource_manager.Client() >>> env_filter = {'labels.environment': 'prod'} >>> for project in client.list_projects(env_filter): @@ -159,10 +159,10 @@ class _ProjectIterator(Iterator): """An iterator over a list of Project resources. You shouldn't have to use this directly, but instead should use the - helper methods on :class:`gcloud.resource_manager.client.Client` + helper methods on :class:`google.cloud.resource_manager.client.Client` objects. - :type client: :class:`gcloud.resource_manager.client.Client` + :type client: :class:`google.cloud.resource_manager.client.Client` :param client: The client to use for making connections. :type extra_params: dict diff --git a/gcloud/resource_manager/connection.py b/google/cloud/resource_manager/connection.py similarity index 92% rename from gcloud/resource_manager/connection.py rename to google/cloud/resource_manager/connection.py index 49ef2fc2e57b..e6c10b335058 100644 --- a/gcloud/resource_manager/connection.py +++ b/google/cloud/resource_manager/connection.py @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Create / interact with gcloud.resource_manager connections.""" +"""Create / interact with Google Cloud Resource Manager connections.""" -from gcloud import connection as base_connection +from google.cloud import connection as base_connection class Connection(base_connection.JSONConnection): diff --git a/gcloud/resource_manager/project.py b/google/cloud/resource_manager/project.py similarity index 90% rename from gcloud/resource_manager/project.py rename to google/cloud/resource_manager/project.py index 4624d8a27241..a13df3040fdb 100644 --- a/gcloud/resource_manager/project.py +++ b/google/cloud/resource_manager/project.py @@ -15,7 +15,7 @@ """Utility for managing projects via the Cloud Resource Manager API.""" -from gcloud.exceptions import NotFound +from google.cloud.exceptions import NotFound class Project(object): @@ -25,11 +25,11 @@ class Project(object): A :class:`Project` can also be created via :meth:`Client.new_project() \ - ` + ` To manage labels on a :class:`Project`:: - >>> from gcloud import resource_manager + >>> from google.cloud import resource_manager >>> client = resource_manager.Client() >>> project = client.new_project('purple-spaceship-123') >>> project.labels = {'color': 'purple'} @@ -42,7 +42,7 @@ class Project(object): :type project_id: string :param project_id: The globally unique ID of the project. - :type client: :class:`gcloud.resource_manager.client.Client` + :type client: :class:`google.cloud.resource_manager.client.Client` :param client: The Client used with this project. :type name: string @@ -69,10 +69,10 @@ def from_api_repr(cls, resource, client): :type resource: dict :param resource: project resource representation returned from the API - :type client: :class:`gcloud.resource_manager.client.Client` + :type client: :class:`google.cloud.resource_manager.client.Client` :param client: The Client used with this project. - :rtype: :class:`gcloud.resource_manager.project.Project` + :rtype: :class:`google.cloud.resource_manager.project.Project` :returns: The project created. """ project = cls(project_id=resource['projectId'], client=client) @@ -101,12 +101,12 @@ def path(self): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.resource_manager.client.Client` or + :type client: :class:`google.cloud.resource_manager.client.Client` or ``NoneType`` :param client: the client to use. If not passed, falls back to the ``client`` stored on the current project. - :rtype: :class:`gcloud.resource_manager.client.Client` + :rtype: :class:`google.cloud.resource_manager.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -119,7 +119,7 @@ def create(self, client=None): See https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/create - :type client: :class:`gcloud.resource_manager.client.Client` or + :type client: :class:`google.cloud.resource_manager.client.Client` or :data:`NoneType ` :param client: the client to use. If not passed, falls back to the client stored on the current project. @@ -141,7 +141,7 @@ def reload(self, client=None): This method will reload the newest metadata for the project. If you've created a new :class:`Project` instance via :meth:`Client.new_project() \ - `, + `, this method will retrieve project metadata. .. warning:: @@ -152,7 +152,7 @@ def reload(self, client=None): See https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/get - :type client: :class:`gcloud.resource_manager.client.Client` or + :type client: :class:`google.cloud.resource_manager.client.Client` or :data:`NoneType ` :param client: the client to use. If not passed, falls back to the client stored on the current project. @@ -170,7 +170,7 @@ def exists(self, client=None): See https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/get - :type client: :class:`gcloud.resource_manager.client.Client` or + :type client: :class:`google.cloud.resource_manager.client.Client` or :data:`NoneType ` :param client: the client to use. If not passed, falls back to the client stored on the current project. @@ -195,7 +195,7 @@ def update(self, client=None): See https://cloud.google.com/resource-manager/reference/rest/v1beta1/projects/update - :type client: :class:`gcloud.resource_manager.client.Client` or + :type client: :class:`google.cloud.resource_manager.client.Client` or :data:`NoneType ` :param client: the client to use. If not passed, falls back to the client stored on the current project. @@ -219,7 +219,7 @@ def delete(self, client=None, reload_data=False): ``DELETE_IN_PROGRESS`` state, which means the deleting has actually begun. - :type client: :class:`gcloud.resource_manager.client.Client` or + :type client: :class:`google.cloud.resource_manager.client.Client` or :data:`NoneType ` :param client: the client to use. If not passed, falls back to the client stored on the current project. @@ -249,7 +249,7 @@ def undelete(self, client=None, reload_data=False): If the project has already reached a status of ``DELETE_IN_PROGRESS``, this request will fail and the project cannot be restored. - :type client: :class:`gcloud.resource_manager.client.Client` or + :type client: :class:`google.cloud.resource_manager.client.Client` or :data:`NoneType ` :param client: the client to use. If not passed, falls back to the client stored on the current project. diff --git a/gcloud/storage/__init__.py b/google/cloud/storage/__init__.py similarity index 72% rename from gcloud/storage/__init__.py rename to google/cloud/storage/__init__.py index 8847798d25e3..5a1b6b07dca2 100644 --- a/gcloud/storage/__init__.py +++ b/google/cloud/storage/__init__.py @@ -16,7 +16,7 @@ You'll typically use these to get started with the API: ->>> from gcloud import storage +>>> from google.cloud import storage >>> client = storage.Client() >>> bucket = client.get_bucket('bucket-id-here') >>> # Then do other things... @@ -28,22 +28,22 @@ The main concepts with this API are: -- :class:`gcloud.storage.connection.Connection` which represents a +- :class:`google.cloud.storage.connection.Connection` which represents a connection between your machine and the Cloud Storage API. -- :class:`gcloud.storage.bucket.Bucket` which represents a particular +- :class:`google.cloud.storage.bucket.Bucket` which represents a particular bucket (akin to a mounted disk on a computer). -- :class:`gcloud.storage.blob.Blob` which represents a pointer to a +- :class:`google.cloud.storage.blob.Blob` which represents a pointer to a particular entity in Cloud Storage (akin to a file path on a remote machine). """ -from gcloud.storage.batch import Batch -from gcloud.storage.blob import Blob -from gcloud.storage.bucket import Bucket -from gcloud.storage.client import Client -from gcloud.storage.connection import Connection +from google.cloud.storage.batch import Batch +from google.cloud.storage.blob import Blob +from google.cloud.storage.bucket import Bucket +from google.cloud.storage.client import Client +from google.cloud.storage.connection import Connection SCOPE = Connection.SCOPE diff --git a/gcloud/storage/_helpers.py b/google/cloud/storage/_helpers.py similarity index 92% rename from gcloud/storage/_helpers.py rename to google/cloud/storage/_helpers.py index 538b5969f5b2..73f690959490 100644 --- a/gcloud/storage/_helpers.py +++ b/google/cloud/storage/_helpers.py @@ -50,11 +50,12 @@ def client(self): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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. - :rtype: :class:`gcloud.storage.client.Client` + :rtype: :class:`google.cloud.storage.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -64,7 +65,8 @@ def _require_client(self, client): def reload(self, client=None): """Reload properties from Cloud Storage. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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. """ @@ -98,7 +100,7 @@ def _patch_property(self, name, value): def _set_properties(self, value): """Set the properties for the current object. - :type value: dict or :class:`gcloud.storage.batch._FutureDict` + :type value: dict or :class:`google.cloud.storage.batch._FutureDict` :param value: The properties to be set. """ self._properties = value @@ -110,7 +112,8 @@ def patch(self, client=None): Updates the ``_properties`` with the response from the backend. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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. """ diff --git a/gcloud/storage/acl.py b/google/cloud/storage/acl.py similarity index 93% rename from gcloud/storage/acl.py rename to google/cloud/storage/acl.py index 92a955239fa1..665dce1b7078 100644 --- a/gcloud/storage/acl.py +++ b/google/cloud/storage/acl.py @@ -14,11 +14,11 @@ """Manipulate access control lists that Cloud Storage provides. -:class:`gcloud.storage.bucket.Bucket` has a getting method that creates +:class:`google.cloud.storage.bucket.Bucket` has a getting method that creates an ACL object under the hood, and you can interact with that using -:func:`gcloud.storage.bucket.Bucket.acl`:: +:func:`google.cloud.storage.bucket.Bucket.acl`:: - >>> from gcloud import storage + >>> from google.cloud import storage >>> client = storage.Client() >>> bucket = client.get_bucket(bucket_name) >>> acl = bucket.acl @@ -58,13 +58,13 @@ >>> acl.all().grant_read().revoke_write() After that, you can save any changes you make with the -:func:`gcloud.storage.acl.ACL.save` method:: +:func:`google.cloud.storage.acl.ACL.save` method:: >>> acl.save() -You can alternatively save any existing :class:`gcloud.storage.acl.ACL` +You can alternatively save any existing :class:`google.cloud.storage.acl.ACL` object (whether it was created by a factory method or not) from a -:class:`gcloud.storage.bucket.Bucket`:: +:class:`google.cloud.storage.bucket.Bucket`:: >>> bucket.acl.save(acl=acl) @@ -382,11 +382,12 @@ def client(self): def _require_client(self, client): """Check client or verify over-ride. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 ACL. - :rtype: :class:`gcloud.storage.client.Client` + :rtype: :class:`google.cloud.storage.client.Client` :returns: The client passed in or the currently bound client. """ if client is None: @@ -396,7 +397,8 @@ def _require_client(self, client): def reload(self, client=None): """Reload the ACL data from Cloud Storage. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 ACL's parent. """ @@ -413,7 +415,7 @@ def reload(self, client=None): def _save(self, acl, predefined, client): """Helper for :meth:`save` and :meth:`save_predefined`. - :type acl: :class:`gcloud.storage.acl.ACL`, or a compatible list. + :type acl: :class:`google.cloud.storage.acl.ACL`, or a compatible list. :param acl: The ACL object to save. If left blank, this will save current entries. @@ -422,7 +424,8 @@ def _save(self, acl, predefined, client): of the keys in :attr:`PREDEFINED_JSON_ACLS` If passed, `acl` must be None. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 ACL's parent. """ @@ -446,11 +449,12 @@ def _save(self, acl, predefined, client): def save(self, acl=None, client=None): """Save this ACL for the current bucket. - :type acl: :class:`gcloud.storage.acl.ACL`, or a compatible list. + :type acl: :class:`google.cloud.storage.acl.ACL`, or a compatible list. :param acl: The ACL object to save. If left blank, this will save current entries. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 ACL's parent. """ @@ -473,7 +477,8 @@ def save_predefined(self, predefined, client=None): aliased to the corresponding JSON name). If passed, `acl` must be None. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 ACL's parent. """ @@ -492,7 +497,8 @@ def clear(self, client=None): have access to a bucket that you created even after you clear ACL rules with this method. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 ACL's parent. """ @@ -502,7 +508,7 @@ def clear(self, client=None): class BucketACL(ACL): """An ACL specifically for a bucket. - :type bucket: :class:`gcloud.storage.bucket.Bucket` + :type bucket: :class:`google.cloud.storage.bucket.Bucket` :param bucket: The bucket to which this ACL relates. """ @@ -536,7 +542,7 @@ class DefaultObjectACL(BucketACL): class ObjectACL(ACL): """An ACL specifically for a Cloud Storage object / blob. - :type blob: :class:`gcloud.storage.blob.Blob` + :type blob: :class:`google.cloud.storage.blob.Blob` :param blob: The blob that this ACL corresponds to. """ diff --git a/gcloud/storage/batch.py b/google/cloud/storage/batch.py similarity index 98% rename from gcloud/storage/batch.py rename to google/cloud/storage/batch.py index d4b56720e24b..b1221647eead 100644 --- a/gcloud/storage/batch.py +++ b/google/cloud/storage/batch.py @@ -26,8 +26,8 @@ import httplib2 import six -from gcloud.exceptions import make_exception -from gcloud.storage.connection import Connection +from google.cloud.exceptions import make_exception +from google.cloud.storage.connection import Connection class MIMEApplicationHTTP(MIMEApplication): @@ -126,7 +126,7 @@ def __setitem__(self, key, value): class Batch(Connection): """Proxy an underlying connection, batching up change operations. - :type client: :class:`gcloud.storage.client.Client` + :type client: :class:`google.cloud.storage.client.Client` :param client: The client to use for making connections. """ _MAX_BATCH_SIZE = 1000 diff --git a/gcloud/storage/blob.py b/google/cloud/storage/blob.py similarity index 92% rename from gcloud/storage/blob.py rename to google/cloud/storage/blob.py index aeb7af704df3..d8c1a17e6920 100644 --- a/gcloud/storage/blob.py +++ b/google/cloud/storage/blob.py @@ -28,20 +28,20 @@ import six from six.moves.urllib.parse import quote -from gcloud._helpers import _rfc3339_to_datetime -from gcloud._helpers import _to_bytes -from gcloud._helpers import _bytes_to_unicode -from gcloud.credentials import generate_signed_url -from gcloud.exceptions import NotFound -from gcloud.exceptions import make_exception -from gcloud.storage._helpers import _PropertyMixin -from gcloud.storage._helpers import _scalar_property -from gcloud.storage.acl import ObjectACL -from gcloud.streaming.http_wrapper import Request -from gcloud.streaming.http_wrapper import make_api_request -from gcloud.streaming.transfer import Download -from gcloud.streaming.transfer import RESUMABLE_UPLOAD -from gcloud.streaming.transfer import Upload +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.storage._helpers import _PropertyMixin +from google.cloud.storage._helpers import _scalar_property +from google.cloud.storage.acl import ObjectACL +from google.cloud.streaming.http_wrapper import Request +from google.cloud.streaming.http_wrapper import make_api_request +from google.cloud.streaming.transfer import Download +from google.cloud.streaming.transfer import RESUMABLE_UPLOAD +from google.cloud.streaming.transfer import Upload _API_ACCESS_ENDPOINT = 'https://storage.googleapis.com' @@ -54,7 +54,7 @@ class Blob(_PropertyMixin): :param name: The name of the blob. This corresponds to the unique path of the object in the bucket. - :type bucket: :class:`gcloud.storage.bucket.Bucket` + :type bucket: :class:`google.cloud.storage.bucket.Bucket` :param bucket: The bucket to which this blob belongs. :type chunk_size: integer @@ -170,7 +170,7 @@ def generate_signed_url(self, expiration, method='GET', service account from a JSON file rather than a GCE service account. .. _Issue 922: https://github.com/GoogleCloudPlatform/\ - gcloud-python/issues/922 + google-cloud-python/issues/922 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 @@ -207,7 +207,8 @@ def generate_signed_url(self, expiration, method='GET', for the signed URL. Used to over-ride the content type of the underlying blob/object. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 blob's bucket. @@ -242,7 +243,8 @@ def generate_signed_url(self, expiration, method='GET', def exists(self, client=None): """Determines whether or not this blob exists. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 blob's bucket. @@ -269,15 +271,16 @@ def exists(self, client=None): def delete(self, client=None): """Deletes a blob from Cloud Storage. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 blob's bucket. :rtype: :class:`Blob` :returns: The blob that was just deleted. - :raises: :class:`gcloud.exceptions.NotFound` + :raises: :class:`google.cloud.exceptions.NotFound` (propagated from - :meth:`gcloud.storage.bucket.Bucket.delete_blob`). + :meth:`google.cloud.storage.bucket.Bucket.delete_blob`). """ return self.bucket.delete_blob(self.name, client=client) @@ -292,8 +295,8 @@ def download_to_file(self, file_obj, encryption_key=None, client=None): Downloading a file that has been encrypted with a `customer-supplied`_ encryption key:: - >>> from gcloud import storage - >>> from gcloud.storage import Blob + >>> from google.cloud import storage + >>> from google.cloud.storage import Blob >>> client = storage.Client(project='my-project') >>> bucket = client.get_bucket('my-bucket') @@ -316,11 +319,12 @@ def download_to_file(self, file_obj, encryption_key=None, client=None): :param encryption_key: Optional 32 byte encryption key for customer-supplied encryption. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 blob's bucket. - :raises: :class:`gcloud.exceptions.NotFound` + :raises: :class:`google.cloud.exceptions.NotFound` """ client = self._require_client(client) if self.media_link is None: # not yet loaded @@ -358,11 +362,12 @@ def download_to_filename(self, filename, encryption_key=None, client=None): :param encryption_key: Optional 32 byte encryption key for customer-supplied encryption. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 blob's bucket. - :raises: :class:`gcloud.exceptions.NotFound` + :raises: :class:`google.cloud.exceptions.NotFound` """ with open(filename, 'wb') as file_obj: self.download_to_file(file_obj, encryption_key=encryption_key, @@ -378,13 +383,14 @@ def download_as_string(self, encryption_key=None, client=None): :param encryption_key: Optional 32 byte encryption key for customer-supplied encryption. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 blob's bucket. :rtype: bytes :returns: The data stored in this blob. - :raises: :class:`gcloud.exceptions.NotFound` + :raises: :class:`google.cloud.exceptions.NotFound` """ string_buffer = BytesIO() self.download_to_file(string_buffer, encryption_key=encryption_key, @@ -425,8 +431,8 @@ def upload_from_file(self, file_obj, rewind=False, size=None, Uploading a file with a `customer-supplied`_ encryption key:: - >>> from gcloud import storage - >>> from gcloud.storage import Blob + >>> from google.cloud import storage + >>> from google.cloud.storage import Blob >>> client = storage.Client(project='my-project') >>> bucket = client.get_bucket('my-bucket') @@ -465,13 +471,14 @@ def upload_from_file(self, file_obj, rewind=False, size=None, :type num_retries: integer :param num_retries: Number of upload retries. Defaults to 6. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 blob's bucket. :raises: :class:`ValueError` if size is not passed in and can not be - determined; :class:`gcloud.exceptions.GCloudError` if the - upload response returns an error status. + determined; :class:`google.cloud.exceptions.GoogleCloudError` + if the upload response returns an error status. """ client = self._require_client(client) # Use the private ``_connection`` rather than the public @@ -584,7 +591,8 @@ def upload_from_filename(self, filename, content_type=None, :param encryption_key: Optional 32 byte encryption key for customer-supplied encryption. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 blob's bucket. """ @@ -623,7 +631,8 @@ def upload_from_string(self, data, content_type='text/plain', :param encryption_key: Optional 32 byte encryption key for customer-supplied encryption. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 blob's bucket. """ @@ -638,7 +647,8 @@ def upload_from_string(self, data, content_type='text/plain', def make_public(self, client=None): """Make this blob public giving all users read access. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 blob's bucket. """ diff --git a/gcloud/storage/bucket.py b/google/cloud/storage/bucket.py similarity index 90% rename from gcloud/storage/bucket.py rename to google/cloud/storage/bucket.py index 1d79ae794ce8..f9b0ae73f6f0 100644 --- a/gcloud/storage/bucket.py +++ b/google/cloud/storage/bucket.py @@ -12,35 +12,35 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Create / interact with gcloud storage buckets.""" +"""Create / interact with Google Cloud Storage buckets.""" import copy import six -from gcloud._helpers import _rfc3339_to_datetime -from gcloud.exceptions import NotFound -from gcloud.iterator import Iterator -from gcloud.storage._helpers import _PropertyMixin -from gcloud.storage._helpers import _scalar_property -from gcloud.storage.acl import BucketACL -from gcloud.storage.acl import DefaultObjectACL -from gcloud.storage.blob import Blob +from google.cloud._helpers import _rfc3339_to_datetime +from google.cloud.exceptions import NotFound +from google.cloud.iterator import Iterator +from google.cloud.storage._helpers import _PropertyMixin +from google.cloud.storage._helpers import _scalar_property +from google.cloud.storage.acl import BucketACL +from google.cloud.storage.acl import DefaultObjectACL +from google.cloud.storage.blob import Blob class _BlobIterator(Iterator): """An iterator listing blobs in a bucket You shouldn't have to use this directly, but instead should use the - :class:`gcloud.storage.blob.Bucket.list_blobs` method. + :class:`google.cloud.storage.blob.Bucket.list_blobs` method. - :type bucket: :class:`gcloud.storage.bucket.Bucket` + :type bucket: :class:`google.cloud.storage.bucket.Bucket` :param bucket: The bucket from which to list blobs. :type extra_params: dict or None :param extra_params: Extra query string parameters for the API call. - :type client: :class:`gcloud.storage.client.Client` + :type client: :class:`google.cloud.storage.client.Client` :param client: Optional. The client to use for making connections. Defaults to the bucket's client. """ @@ -72,7 +72,7 @@ def get_items_from_response(self, response): class Bucket(_PropertyMixin): """A class representing a Bucket on Cloud Storage. - :type client: :class:`gcloud.storage.client.Client` + :type client: :class:`google.cloud.storage.client.Client` :param client: A client which holds credentials and project configuration for the bucket (which requires a project). @@ -118,7 +118,7 @@ def blob(self, blob_name, chunk_size=None): (1 MB). This must be a multiple of 256 KB per the API specification. - :rtype: :class:`gcloud.storage.blob.Blob` + :rtype: :class:`google.cloud.storage.blob.Blob` :returns: The blob object created. """ return Blob(name=blob_name, bucket=self, chunk_size=chunk_size) @@ -126,7 +126,8 @@ def blob(self, blob_name, chunk_size=None): def exists(self, client=None): """Determines whether or not this bucket exists. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 bucket. @@ -154,11 +155,12 @@ def create(self, client=None): """Creates current bucket. If the bucket already exists, will raise - :class:`gcloud.exceptions.Conflict`. + :class:`google.cloud.exceptions.Conflict`. This implements "storage.buckets.insert". - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 bucket. """ @@ -207,7 +209,7 @@ def get_blob(self, blob_name, client=None): This will return None if the blob doesn't exist:: - >>> from gcloud import storage + >>> from google.cloud import storage >>> client = storage.Client() >>> bucket = client.get_bucket('my-bucket') >>> print bucket.get_blob('/path/to/blob.txt') @@ -218,11 +220,12 @@ def get_blob(self, blob_name, client=None): :type blob_name: string :param blob_name: The name of the blob to retrieve. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 bucket. - :rtype: :class:`gcloud.storage.blob.Blob` or None + :rtype: :class:`google.cloud.storage.blob.Blob` or None :returns: The blob object if it exists, otherwise None. """ client = self._require_client(client) @@ -273,7 +276,8 @@ def list_blobs(self, max_results=None, page_token=None, prefix=None, and the language of each blob returned: 'items/contentLanguage,nextPageToken' - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 bucket. @@ -304,7 +308,9 @@ def list_blobs(self, max_results=None, page_token=None, prefix=None, # Page token must be handled specially since the base `Iterator` # class has it as a reserved property. if page_token is not None: + # pylint: disable=attribute-defined-outside-init result.next_page_token = page_token + # pylint: enable=attribute-defined-outside-init return result def delete(self, force=False, client=None): @@ -315,8 +321,9 @@ def delete(self, force=False, client=None): objects / blobs in the bucket (i.e. try to empty the bucket). If the bucket doesn't exist, this will raise - :class:`gcloud.exceptions.NotFound`. If the bucket is not empty - (and ``force=False``), will raise :class:`gcloud.exceptions.Conflict`. + :class:`google.cloud.exceptions.NotFound`. If the bucket is not empty + (and ``force=False``), will raise + :class:`google.cloud.exceptions.Conflict`. If ``force=True`` and the bucket contains more than 256 objects / blobs this will cowardly refuse to delete the objects (or the bucket). This @@ -326,7 +333,8 @@ def delete(self, force=False, client=None): :type force: boolean :param force: If True, empties the bucket's objects then deletes it. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 bucket. @@ -361,12 +369,12 @@ def delete_blob(self, blob_name, client=None): """Deletes a blob from the current bucket. If the blob isn't found (backend 404), raises a - :class:`gcloud.exceptions.NotFound`. + :class:`google.cloud.exceptions.NotFound`. For example:: - >>> from gcloud.exceptions import NotFound - >>> from gcloud import storage + >>> from google.cloud.exceptions import NotFound + >>> from google.cloud import storage >>> client = storage.Client() >>> bucket = client.get_bucket('my-bucket') >>> print bucket.list_blobs() @@ -380,11 +388,12 @@ def delete_blob(self, blob_name, client=None): :type blob_name: string :param blob_name: A blob name to delete. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 bucket. - :raises: :class:`gcloud.exceptions.NotFound` (to suppress + :raises: :class:`google.cloud.exceptions.NotFound` (to suppress the exception, call ``delete_blobs``, passing a no-op ``on_error`` callback, e.g.:: @@ -403,19 +412,20 @@ def delete_blobs(self, blobs, on_error=None, client=None): Uses :func:`Bucket.delete_blob` to delete each individual blob. - :type blobs: list of string or :class:`gcloud.storage.blob.Blob` + :type blobs: list of string or :class:`google.cloud.storage.blob.Blob` :param blobs: A list of blob names or Blob objects to delete. :type on_error: a callable taking (blob) :param on_error: If not ``None``, called once for each blob raising - :class:`gcloud.exceptions.NotFound`; + :class:`google.cloud.exceptions.NotFound`; otherwise, the exception is propagated. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 bucket. - :raises: :class:`gcloud.exceptions.NotFound` (if + :raises: :class:`google.cloud.exceptions.NotFound` (if `on_error` is not passed). """ for blob in blobs: @@ -434,21 +444,22 @@ def copy_blob(self, blob, destination_bucket, new_name=None, client=None): """Copy the given blob to the given bucket, optionally with a new name. - :type blob: :class:`gcloud.storage.blob.Blob` + :type blob: :class:`google.cloud.storage.blob.Blob` :param blob: The blob to be copied. - :type destination_bucket: :class:`gcloud.storage.bucket.Bucket` + :type destination_bucket: :class:`google.cloud.storage.bucket.Bucket` :param destination_bucket: The bucket into which the blob should be copied. :type new_name: string :param new_name: (optional) the new name for the copied file. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 bucket. - :rtype: :class:`gcloud.storage.blob.Blob` + :rtype: :class:`google.cloud.storage.blob.Blob` :returns: The new Blob. """ client = self._require_client(client) @@ -473,13 +484,14 @@ def rename_blob(self, blob, new_name, client=None): old blob. This means that with very large objects renaming could be a very (temporarily) costly or a very slow operation. - :type blob: :class:`gcloud.storage.blob.Blob` + :type blob: :class:`google.cloud.storage.blob.Blob` :param blob: The blob to be renamed. :type new_name: string :param new_name: The new name for this blob. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 bucket. @@ -735,7 +747,7 @@ 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:: - >>> from gcloud import storage + >>> from google.cloud import storage >>> client = storage.Client() >>> bucket = client.get_bucket(bucket_name) >>> bucket.configure_website('index.html', '404.html') @@ -785,7 +797,8 @@ def make_public(self, recursive=False, future=False, client=None): :param future: If True, this will make all objects created in the future public as well. - :type client: :class:`gcloud.storage.client.Client` or ``NoneType`` + :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 bucket. """ diff --git a/gcloud/storage/client.py b/google/cloud/storage/client.py similarity index 86% rename from gcloud/storage/client.py rename to google/cloud/storage/client.py index b3abe09e7913..5a8a5d8f1fbe 100644 --- a/gcloud/storage/client.py +++ b/google/cloud/storage/client.py @@ -15,13 +15,13 @@ """Client for interacting with the Google Cloud Storage API.""" -from gcloud._helpers import _LocalStack -from gcloud.client import JSONClient -from gcloud.exceptions import NotFound -from gcloud.iterator import Iterator -from gcloud.storage.batch import Batch -from gcloud.storage.bucket import Bucket -from gcloud.storage.connection import Connection +from google.cloud._helpers import _LocalStack +from google.cloud.client import JSONClient +from google.cloud.exceptions import NotFound +from google.cloud.iterator import Iterator +from google.cloud.storage.batch import Batch +from google.cloud.storage.bucket import Bucket +from google.cloud.storage.connection import Connection class Client(JSONClient): @@ -57,7 +57,7 @@ def __init__(self, project=None, credentials=None, http=None): def connection(self): """Get connection or batch on the client. - :rtype: :class:`gcloud.storage.connection.Connection` + :rtype: :class:`google.cloud.storage.connection.Connection` :returns: The connection set on the client, or the batch if one is set. """ @@ -74,7 +74,7 @@ def connection(self, value): self.connection = connection Will raise if the connection is set more than once. - :type value: :class:`gcloud.storage.connection.Connection` + :type value: :class:`google.cloud.storage.connection.Connection` :param value: The connection set on the client. :raises: :class:`ValueError` if connection has already been set. @@ -88,7 +88,7 @@ def _push_batch(self, batch): "Protected", intended for use by batch context mgrs. - :type batch: :class:`gcloud.storage.batch.Batch` + :type batch: :class:`google.cloud.storage.batch.Batch` :param batch: newly-active batch """ self._batch_stack.push(batch) @@ -99,7 +99,7 @@ def _pop_batch(self): "Protected", intended for use by batch context mgrs. :raises: IndexError if the stack is empty. - :rtype: :class:`gcloud.storage.batch.Batch` + :rtype: :class:`google.cloud.storage.batch.Batch` :returns: the top-most batch/transaction, after removing it. """ return self._batch_stack.pop() @@ -108,7 +108,7 @@ def _pop_batch(self): def current_batch(self): """Currently-active batch. - :rtype: :class:`gcloud.storage.batch.Batch` or ``NoneType`` (if + :rtype: :class:`google.cloud.storage.batch.Batch` or ``NoneType`` (if no batch is active). :returns: The batch at the top of the batch stack. """ @@ -124,7 +124,7 @@ def bucket(self, bucket_name): :type bucket_name: string :param bucket_name: The name of the bucket to be instantiated. - :rtype: :class:`gcloud.storage.bucket.Bucket` + :rtype: :class:`google.cloud.storage.bucket.Bucket` :returns: The bucket object created. """ return Bucket(client=self, name=bucket_name) @@ -136,7 +136,7 @@ def batch(self): This will not make an HTTP request; it simply instantiates a batch object owned by this client. - :rtype: :class:`gcloud.storage.batch.Batch` + :rtype: :class:`google.cloud.storage.batch.Batch` :returns: The batch object created. """ return Batch(client=self) @@ -145,13 +145,13 @@ def get_bucket(self, bucket_name): """Get a bucket by name. If the bucket isn't found, this will raise a - :class:`gcloud.storage.exceptions.NotFound`. + :class:`google.cloud.storage.exceptions.NotFound`. For example:: >>> try: >>> bucket = client.get_bucket('my-bucket') - >>> except gcloud.exceptions.NotFound: + >>> except google.cloud.exceptions.NotFound: >>> print 'Sorry, that bucket does not exist!' This implements "storage.buckets.get". @@ -159,9 +159,9 @@ def get_bucket(self, bucket_name): :type bucket_name: string :param bucket_name: The name of the bucket to get. - :rtype: :class:`gcloud.storage.bucket.Bucket` + :rtype: :class:`google.cloud.storage.bucket.Bucket` :returns: The bucket matching the name provided. - :raises: :class:`gcloud.exceptions.NotFound` + :raises: :class:`google.cloud.exceptions.NotFound` """ bucket = Bucket(self, name=bucket_name) bucket.reload(client=self) @@ -183,7 +183,7 @@ def lookup_bucket(self, bucket_name): :type bucket_name: string :param bucket_name: The name of the bucket to get. - :rtype: :class:`gcloud.storage.bucket.Bucket` + :rtype: :class:`google.cloud.storage.bucket.Bucket` :returns: The bucket matching the name provided or None if not found. """ try: @@ -203,12 +203,12 @@ def create_bucket(self, bucket_name): This implements "storage.buckets.insert". If the bucket already exists, will raise - :class:`gcloud.exceptions.Conflict`. + :class:`google.cloud.exceptions.Conflict`. :type bucket_name: string :param bucket_name: The bucket name to create. - :rtype: :class:`gcloud.storage.bucket.Bucket` + :rtype: :class:`google.cloud.storage.bucket.Bucket` :returns: The newly created bucket. """ bucket = Bucket(self, name=bucket_name) @@ -250,7 +250,8 @@ def list_buckets(self, max_results=None, page_token=None, prefix=None, and the language of each bucket returned: 'items/id,nextPageToken' - :rtype: iterable of :class:`gcloud.storage.bucket.Bucket` objects. + :rtype: iterable of :class:`google.cloud.storage.bucket.Bucket` + objects. :returns: All buckets belonging to this project. """ extra_params = {'project': self.project} @@ -271,7 +272,9 @@ def list_buckets(self, max_results=None, page_token=None, prefix=None, # Page token must be handled specially since the base `Iterator` # class has it as a reserved property. if page_token is not None: + # pylint: disable=attribute-defined-outside-init result.next_page_token = page_token + # pylint: enable=attribute-defined-outside-init return result @@ -279,10 +282,10 @@ class _BucketIterator(Iterator): """An iterator listing all buckets. You shouldn't have to use this directly, but instead should use the - helper methods on :class:`gcloud.storage.connection.Connection` + helper methods on :class:`google.cloud.storage.connection.Connection` objects. - :type client: :class:`gcloud.storage.client.Client` + :type client: :class:`google.cloud.storage.client.Client` :param client: The client to use for making connections. :type extra_params: dict or ``NoneType`` diff --git a/gcloud/storage/connection.py b/google/cloud/storage/connection.py similarity index 93% rename from gcloud/storage/connection.py rename to google/cloud/storage/connection.py index 7aec23b3844d..034767e8ff1f 100644 --- a/gcloud/storage/connection.py +++ b/google/cloud/storage/connection.py @@ -12,9 +12,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Create / interact with gcloud storage connections.""" +"""Create / interact with Google Cloud Storage connections.""" -from gcloud import connection as base_connection +from google.cloud import connection as base_connection class Connection(base_connection.JSONConnection): diff --git a/gcloud/streaming/__init__.py b/google/cloud/streaming/__init__.py similarity index 93% rename from gcloud/streaming/__init__.py rename to google/cloud/streaming/__init__.py index b3cb0f016354..1a7427cf5f3b 100644 --- a/gcloud/streaming/__init__.py +++ b/google/cloud/streaming/__init__.py @@ -13,3 +13,5 @@ # limitations under the License. # Vendored-in from google-apitools 0.4.11 + +"""Base ``google.cloud.streaming`` package.""" diff --git a/gcloud/streaming/buffered_stream.py b/google/cloud/streaming/buffered_stream.py similarity index 100% rename from gcloud/streaming/buffered_stream.py rename to google/cloud/streaming/buffered_stream.py diff --git a/gcloud/streaming/exceptions.py b/google/cloud/streaming/exceptions.py similarity index 95% rename from gcloud/streaming/exceptions.py rename to google/cloud/streaming/exceptions.py index 780686fe23f3..23ffa42995c2 100644 --- a/gcloud/streaming/exceptions.py +++ b/google/cloud/streaming/exceptions.py @@ -59,7 +59,7 @@ def status_code(self): def from_response(cls, http_response): """Factory: construct an exception from a response. - :type http_response: :class:`gcloud.streaming.http_wrapper.Response` + :type http_response: :class:`~.streaming.http_wrapper.Response` :param http_response: the response which returned the error :rtype: :class:`HttpError` @@ -108,7 +108,7 @@ def __init__(self, response, content, url, retry_after): def from_response(cls, http_response): """Factory: construct an exception from a response. - :type http_response: :class:`gcloud.streaming.http_wrapper.Response` + :type http_response: :class:`~.streaming.http_wrapper.Response` :param http_response: the response which returned the error. :rtype: :class:`RetryAfterError` diff --git a/gcloud/streaming/http_wrapper.py b/google/cloud/streaming/http_wrapper.py similarity index 94% rename from gcloud/streaming/http_wrapper.py rename to google/cloud/streaming/http_wrapper.py index 0eb856c97d94..d1f4b8d3942e 100644 --- a/gcloud/streaming/http_wrapper.py +++ b/google/cloud/streaming/http_wrapper.py @@ -29,10 +29,10 @@ from six.moves import http_client from six.moves.urllib import parse -from gcloud.streaming.exceptions import BadStatusCodeError -from gcloud.streaming.exceptions import RequestError -from gcloud.streaming.exceptions import RetryAfterError -from gcloud.streaming.util import calculate_wait_for_retry +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 @@ -272,10 +272,10 @@ def _check_response(response): :type response: :class:`Response` :param response: the response to validate - :raises: :exc:`gcloud.streaming.exceptions.RequestError` if response is - None, :exc:`gcloud.streaming.exceptions.BadStatusCodeError` if + :raises: :exc:`google.cloud.streaming.exceptions.RequestError` if response + is None, :exc:`~.streaming.exceptions.BadStatusCodeError` if response status code indicates an error, or - :exc:`gcloud.streaming.exceptions.RetryAfterError` if response + :exc:`~.streaming.exceptions.RetryAfterError` if response indicates a retry interval. """ if response is None: @@ -326,8 +326,8 @@ def _make_api_request_no_retry(http, http_request, redirections=_REDIRECTIONS): :rtype: :class:`Response` :returns: an object representing the server's response - :raises: :exc:`gcloud.streaming.exceptions.RequestError` if no response - could be parsed. + :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 @@ -374,8 +374,8 @@ def make_api_request(http, http_request, retries=7, :rtype: :class:`Response` :returns: an object representing the server's response. - :raises: :exc:`gcloud.streaming.exceptions.RequestError` if no response - could be parsed. + :raises: :exc:`google.cloud.streaming.exceptions.RequestError` if no + response could be parsed. """ retry = 0 while True: diff --git a/gcloud/streaming/stream_slice.py b/google/cloud/streaming/stream_slice.py similarity index 100% rename from gcloud/streaming/stream_slice.py rename to google/cloud/streaming/stream_slice.py diff --git a/gcloud/streaming/transfer.py b/google/cloud/streaming/transfer.py similarity index 94% rename from gcloud/streaming/transfer.py rename to google/cloud/streaming/transfer.py index 360075622d79..8738bb349d8b 100644 --- a/gcloud/streaming/transfer.py +++ b/google/cloud/streaming/transfer.py @@ -26,17 +26,17 @@ import six from six.moves import http_client -from gcloud._helpers import _to_bytes -from gcloud.streaming.buffered_stream import BufferedStream -from gcloud.streaming.exceptions import CommunicationError -from gcloud.streaming.exceptions import HttpError -from gcloud.streaming.exceptions import TransferInvalidError -from gcloud.streaming.exceptions import TransferRetryError -from gcloud.streaming.http_wrapper import make_api_request -from gcloud.streaming.http_wrapper import Request -from gcloud.streaming.http_wrapper import RESUME_INCOMPLETE -from gcloud.streaming.stream_slice import StreamSlice -from gcloud.streaming.util import acceptable_mime_type +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 @@ -200,7 +200,7 @@ def initialized(self): def _ensure_initialized(self): """Helper: assert that the instance is initialized. - :raises: :exc:`gcloud.streaming.exceptions.TransferInvalidError` + :raises: :exc:`google.cloud.streaming.exceptions.TransferInvalidError` if the instance is not initialized. """ if not self.initialized: @@ -210,7 +210,7 @@ def _ensure_initialized(self): def _ensure_uninitialized(self): """Helper: assert that the instance is not initialized. - :raises: :exc:`gcloud.streaming.exceptions.TransferInvalidError` + :raises: :exc:`google.cloud.streaming.exceptions.TransferInvalidError` if the instance is already initialized. """ if self.initialized: @@ -334,7 +334,7 @@ def __repr__(self): def configure_request(self, http_request, url_builder): """Update http_request/url_builder with download-appropriate values. - :type http_request: :class:`gcloud.streaming.http_wrapper.Request` + :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. @@ -366,7 +366,7 @@ def initialize_download(self, http_request, http): If the instance has :attr:`auto_transfer` enabled, begins the download immediately. - :type http_request: :class:`gcloud.streaming.http_wrapper.Request` + :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) @@ -402,7 +402,7 @@ def _normalize_start_end(self, start, end=None): :rtype: tuple, (start, end) :returns: the normalized start, end pair. - :raises: :exc:`gcloud.streaming.exceptions.TransferInvalidError` + :raises: :exc:`google.cloud.streaming.exceptions.TransferInvalidError` for invalid combinations of start, end. """ if end is not None: @@ -426,7 +426,7 @@ def _normalize_start_end(self, start, end=None): def _set_range_header(request, start, end=None): """Update the 'Range' header in a request to match a byte range. - :type request: :class:`gcloud.streaming.http_wrapper.Request` + :type request: :class:`google.cloud.streaming.http_wrapper.Request` :param request: the request to update :type start: integer @@ -497,7 +497,7 @@ def _get_chunk(self, start, end): :type end: integer or None :param end: end byte of the range. - :rtype: :class:`gcloud.streaming.http_wrapper.Response` + :rtype: :class:`google.cloud.streaming.http_wrapper.Response` :returns: response from the chunk request. """ self._ensure_initialized() @@ -509,14 +509,14 @@ def _get_chunk(self, start, end): def _process_response(self, response): """Update attribtes and writing stream, based on response. - :type response: :class:`gcloud.streaming.http_wrapper.Response` + :type response: :class:`google.cloud.streaming.http_wrapper.Response` :param response: response from a download request. - :rtype: :class:`gcloud.streaming.http_wrapper.Response` + :rtype: :class:`google.cloud.streaming.http_wrapper.Response` :returns: the response - :raises: :exc:`gcloud.streaming.exceptions.HttpError` for + :raises: :exc:`google.cloud.streaming.exceptions.HttpError` for missing / unauthorized responses; - :exc:`gcloud.streaming.exceptions.TransferRetryError` + :exc:`google.cloud.streaming.exceptions.TransferRetryError` for other error responses. """ if response.status_code not in self._ACCEPTABLE_STATUSES: @@ -564,7 +564,7 @@ def get_range(self, start, end=None, use_chunks=True): and fetch this range in a single request. If True, streams via chunks. - :raises: :exc:`gcloud.streaming.exceptions.TransferRetryError` + :raises: :exc:`google.cloud.streaming.exceptions.TransferRetryError` if a request returns an empty response. """ self._ensure_initialized() @@ -810,7 +810,7 @@ def _set_default_strategy(self, upload_config, http_request): attributes :param upload_config: Configuration for the upload endpoint. - :type http_request: :class:`gcloud.streaming.http_wrapper.Request` + :type http_request: :class:`~.streaming.http_wrapper.Request` :param http_request: The associated http request. """ if upload_config.resumable_path is None: @@ -834,7 +834,7 @@ def configure_request(self, upload_config, http_request, url_builder): attributes :param upload_config: transfer policy object to be queried - :type http_request: :class:`gcloud.streaming.http_wrapper.Request` + :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 @@ -970,7 +970,7 @@ def refresh_upload_state(self): def _get_range_header(response): """Return a 'Range' header from a response. - :type response: :class:`gcloud.streaming.http_wrapper.Response` + :type response: :class:`google.cloud.streaming.http_wrapper.Response` :param response: response to be queried :rtype: string @@ -994,7 +994,7 @@ def _get_range_header(response): def initialize_upload(self, http_request, http): """Initialize this upload from the given http_request. - :type http_request: :class:`gcloud.streaming.http_wrapper.Request` + :type http_request: :class:`~.streaming.http_wrapper.Request` :param http_request: the request to be used :type http: :class:`httplib2.Http` (or workalike) @@ -1002,7 +1002,7 @@ def initialize_upload(self, http_request, http): :raises: :exc:`ValueError` if the instance has not been configured with a strategy. - :rtype: :class:`~gcloud.streaming.http_wrapper.Response` + :rtype: :class:`~google.cloud.streaming.http_wrapper.Response` :returns: The response if the upload is resumable and auto transfer is not used. """ @@ -1070,7 +1070,7 @@ def stream_file(self, use_chunks=True): :param use_chunks: If False, send the stream in a single request. Otherwise, send it in chunks. - :rtype: :class:`gcloud.streaming.http_wrapper.Response` + :rtype: :class:`google.cloud.streaming.http_wrapper.Response` :returns: The response for the final request made. """ if self.strategy != RESUMABLE_UPLOAD: @@ -1110,15 +1110,15 @@ def _send_media_request(self, request, end): Helper for _send_media_body & _send_chunk: - :type request: :class:`gcloud.streaming.http_wrapper.Request` + :type request: :class:`google.cloud.streaming.http_wrapper.Request` :param request: the request to upload :type end: integer :param end: end byte of the to be uploaded - :rtype: :class:`gcloud.streaming.http_wrapper.Response` + :rtype: :class:`google.cloud.streaming.http_wrapper.Response` :returns: the response - :raises: :exc:`gcloud.streaming.exceptions.HttpError` if the status + :raises: :exc:`~.streaming.exceptions.HttpError` if the status code from the response indicates an error. """ response = make_api_request( @@ -1144,7 +1144,7 @@ def _send_media_body(self, start): :type start: integer :param start: start byte of the range. - :rtype: :class:`gcloud.streaming.http_wrapper.Response` + :rtype: :class:`google.cloud.streaming.http_wrapper.Response` :returns: The response from the media upload request. """ self._ensure_initialized() @@ -1174,7 +1174,7 @@ def _send_chunk(self, start): :type start: integer :param start: start byte of the range. - :rtype: :class:`gcloud.streaming.http_wrapper.Response` + :rtype: :class:`google.cloud.streaming.http_wrapper.Response` :returns: The response from the chunked upload request. """ self._ensure_initialized() diff --git a/gcloud/streaming/util.py b/google/cloud/streaming/util.py similarity index 100% rename from gcloud/streaming/util.py rename to google/cloud/streaming/util.py diff --git a/gcloud/translate/__init__.py b/google/cloud/translate/__init__.py similarity index 85% rename from gcloud/translate/__init__.py rename to google/cloud/translate/__init__.py index cd92828db3e4..1b1a15168d15 100644 --- a/gcloud/translate/__init__.py +++ b/google/cloud/translate/__init__.py @@ -14,5 +14,5 @@ """Google Cloud Translate API wrapper.""" -from gcloud.translate.client import Client -from gcloud.translate.connection import Connection +from google.cloud.translate.client import Client +from google.cloud.translate.connection import Connection diff --git a/gcloud/translate/client.py b/google/cloud/translate/client.py similarity index 98% rename from gcloud/translate/client.py rename to google/cloud/translate/client.py index 04d70f4d04ef..10d93ac23d6f 100644 --- a/gcloud/translate/client.py +++ b/google/cloud/translate/client.py @@ -18,8 +18,8 @@ import httplib2 import six -from gcloud._helpers import _to_bytes -from gcloud.translate.connection import Connection +from google.cloud._helpers import _to_bytes +from google.cloud.translate.connection import Connection ENGLISH_ISO_639 = 'en' diff --git a/gcloud/translate/connection.py b/google/cloud/translate/connection.py similarity index 95% rename from gcloud/translate/connection.py rename to google/cloud/translate/connection.py index 17c0f9edf764..36f6f93b38a7 100644 --- a/gcloud/translate/connection.py +++ b/google/cloud/translate/connection.py @@ -14,7 +14,7 @@ """Create / interact with Google Cloud Translate connections.""" -from gcloud import connection as base_connection +from google.cloud import connection as base_connection class Connection(base_connection.JSONConnection): diff --git a/gcloud/vision/__init__.py b/google/cloud/vision/__init__.py similarity index 100% rename from gcloud/vision/__init__.py rename to google/cloud/vision/__init__.py diff --git a/gcloud/vision/_fixtures.py b/google/cloud/vision/_fixtures.py similarity index 100% rename from gcloud/vision/_fixtures.py rename to google/cloud/vision/_fixtures.py diff --git a/gcloud/vision/client.py b/google/cloud/vision/client.py similarity index 93% rename from gcloud/vision/client.py rename to google/cloud/vision/client.py index 56a59b2ed4c6..a955b48da9e3 100644 --- a/gcloud/vision/client.py +++ b/google/cloud/vision/client.py @@ -15,10 +15,10 @@ """Client for interacting with the Google Cloud Vision API.""" -from gcloud.client import JSONClient -from gcloud.vision.connection import Connection -from gcloud.vision.feature import Feature -from gcloud.vision.image import Image +from google.cloud.client import JSONClient +from google.cloud.vision.connection import Connection +from google.cloud.vision.feature import Feature +from google.cloud.vision.image import Image class VisionRequest(object): @@ -89,7 +89,7 @@ def annotate(self, image, features): :param image: A string which can be a URL, a Google Cloud Storage path, or a byte stream of the image. - :type features: list of :class:`gcloud.vision.feature.Feature` + :type features: list of :class:`google.cloud.vision.feature.Feature` :param features: The type of detection that the Vision API should use to determine image attributes. Pricing is based on the number of Feature Types. diff --git a/gcloud/vision/connection.py b/google/cloud/vision/connection.py similarity index 93% rename from gcloud/vision/connection.py rename to google/cloud/vision/connection.py index 8dfb739be7c6..560bc2c024d4 100644 --- a/gcloud/vision/connection.py +++ b/google/cloud/vision/connection.py @@ -13,10 +13,10 @@ # limitations under the License. -"""Create / interact with gcloud Vision connections.""" +"""Create / interact with Google Cloud Vision connections.""" -from gcloud import connection as base_connection +from google.cloud import connection as base_connection class Connection(base_connection.JSONConnection): diff --git a/gcloud/vision/feature.py b/google/cloud/vision/feature.py similarity index 96% rename from gcloud/vision/feature.py rename to google/cloud/vision/feature.py index ee660422c87e..78f7abf0434a 100644 --- a/gcloud/vision/feature.py +++ b/google/cloud/vision/feature.py @@ -34,7 +34,7 @@ class Feature(object): :type feature_type: str :param feature_type: String representation of - :class:`gcloud.vision.feature.FeatureType`. + :class:`google.cloud.vision.feature.FeatureType`. :type max_results: int :param max_results: Number of results to return for the specified diff --git a/gcloud/vision/image.py b/google/cloud/vision/image.py similarity index 95% rename from gcloud/vision/image.py rename to google/cloud/vision/image.py index 02c49f5f1e80..505441e04b7e 100644 --- a/gcloud/vision/image.py +++ b/google/cloud/vision/image.py @@ -17,8 +17,8 @@ from base64 import b64encode -from gcloud._helpers import _to_bytes -from gcloud._helpers import _bytes_to_unicode +from google.cloud._helpers import _to_bytes +from google.cloud._helpers import _bytes_to_unicode class Image(object): diff --git a/scripts/generate_json_docs.py b/scripts/generate_json_docs.py index 1e9d1d77a633..b7a569130529 100644 --- a/scripts/generate_json_docs.py +++ b/scripts/generate_json_docs.py @@ -244,7 +244,7 @@ def build_link_from_list_of_types(type_names, object_type=None): def build_link_from_type(type_name, object_type=None): type_name = clean_type_name(type_name) - if not type_name.startswith('gcloud'): + if not type_name.startswith('google.cloud'): return type_name doc_path = type_name @@ -425,13 +425,13 @@ def write_docs_file(path, contents): def generate_doc_types_json(modules, types_file_path): doc_types_list = [{ - 'id': 'gcloud', + 'id': 'google-cloud', 'contents': 'index.json', - 'title': 'gcloud' + 'title': 'google-cloud' }] for module_name in modules: - if module_name == 'gcloud.__init__': + if module_name == 'google.cloud.__init__': continue module_title = module_name.replace('.__init__', '').split('.') @@ -485,7 +485,7 @@ def generate_module_docs(modules, docs_path, real_base_path, toc): module_docs_path = os.path.join(docs_path, module_path) + '.json' if pdoc_module.functions(): - toc_key = module_name.replace('gcloud.', '').split('.')[0] + toc_key = module_name.replace('google.cloud.', '').split('.')[0] toc_entry = build_toc_entry(module.name, module_path) toc['services'][toc_key].append(toc_entry) @@ -501,7 +501,7 @@ def generate_class_docs(module, klass, base_path, toc): .replace('__init__', 'index')) module_docs_path = os.path.join(base_path, module_path, klass.name.lower()) + '.json' - toc_key = module.name.replace('gcloud.', '').split('.')[0] + toc_key = module.name.replace('google.cloud.', '').split('.')[0] toc_entry = build_toc_entry(klass.name, os.path.join(module_path, @@ -590,8 +590,8 @@ def package_files(generated_json_dir, docs_build_dir, static_json_dir, shutil.rmtree(package_path, ignore_errors=True) shutil.copytree(static_json_dir, package_path) - shutil.copytree(os.path.join(generated_json_dir, 'gcloud'), - os.path.join(package_path, 'json', tag, 'gcloud')) + shutil.copytree(os.path.join(generated_json_dir, 'google', 'cloud'), + os.path.join(package_path, 'json', tag, 'google', 'cloud')) shutil.copyfile(os.path.join(generated_json_dir, 'types.json'), os.path.join(package_path, 'json', tag, 'types.json')) @@ -609,7 +609,8 @@ def main(): toc = { 'services': { '__init__': [], - 'gcloud': [], + 'google': [], + 'cloud': [], 'bigquery': [], 'bigtable': [], 'client': [], @@ -641,8 +642,9 @@ def main(): JSON_DOCS_DIR = os.path.join(DOCS_BUILD_DIR, 'json', args.tag) LIB_DIR = os.path.abspath(args.basepath) - library_dir = os.path.join(LIB_DIR, 'gcloud') - public_mods = get_public_modules(library_dir, base_package='gcloud') + library_dir = os.path.join(LIB_DIR, 'google', 'cloud') + public_mods = get_public_modules(library_dir, + base_package='google.cloud') generate_module_docs(public_mods, JSON_DOCS_DIR, BASE_DIR, toc) generate_doc_types_json(public_mods, diff --git a/scripts/make_datastore_grpc.py b/scripts/make_datastore_grpc.py index 7479b77b17a3..1acb29ea9197 100644 --- a/scripts/make_datastore_grpc.py +++ b/scripts/make_datastore_grpc.py @@ -26,7 +26,7 @@ PROTOS_DIR = os.path.join(ROOT_DIR, 'googleapis-pb') PROTO_PATH = os.path.join(PROTOS_DIR, 'google', 'datastore', 'v1', 'datastore.proto') -GRPC_ONLY_FILE = os.path.join(ROOT_DIR, 'gcloud', 'datastore', +GRPC_ONLY_FILE = os.path.join(ROOT_DIR, 'google', 'cloud', 'datastore', '_generated', 'datastore_grpc_pb2.py') GRPCIO_VIRTUALENV = os.getenv('GRPCIO_VIRTUALENV') if GRPCIO_VIRTUALENV is None: @@ -34,7 +34,8 @@ else: PYTHON_EXECUTABLE = os.path.join(GRPCIO_VIRTUALENV, 'bin', 'python') MESSAGE_SNIPPET = ' = _reflection.GeneratedProtocolMessageType(' -IMPORT_TEMPLATE = 'from gcloud.datastore._generated.datastore_pb2 import %s\n' +IMPORT_TEMPLATE = ( + 'from google.cloud.datastore._generated.datastore_pb2 import %s\n') def get_pb2_contents_with_grpc(): diff --git a/scripts/make_operations_grpc.py b/scripts/make_operations_grpc.py index b60f57833386..375887d2379b 100644 --- a/scripts/make_operations_grpc.py +++ b/scripts/make_operations_grpc.py @@ -27,7 +27,7 @@ PROTO_PATH = os.path.join(PROTOS_DIR, 'google', 'longrunning', 'operations.proto') GENERATED_SUBDIR = os.getenv('GENERATED_SUBDIR', '_generated') -GRPC_ONLY_FILE = os.path.join(ROOT_DIR, 'gcloud', 'bigtable', +GRPC_ONLY_FILE = os.path.join(ROOT_DIR, 'google', 'cloud', 'bigtable', GENERATED_SUBDIR, 'operations_grpc_pb2.py') GRPCIO_VIRTUALENV = os.getenv('GRPCIO_VIRTUALENV') if GRPCIO_VIRTUALENV is None: diff --git a/scripts/pycodestyle_on_repo.py b/scripts/pycodestyle_on_repo.py index b43e2bf9b85a..777ca197fb7a 100644 --- a/scripts/pycodestyle_on_repo.py +++ b/scripts/pycodestyle_on_repo.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Custom script to run pycodestyle on gcloud codebase. +"""Custom script to run pycodestyle on google-cloud codebase. This runs pycodestyle as a script via subprocess but only runs it on the .py files that are checked in to the repository. diff --git a/scripts/pylintrc_default b/scripts/pylintrc_default index b42b776992b4..893435eef1ef 100644 --- a/scripts/pylintrc_default +++ b/scripts/pylintrc_default @@ -1,4 +1,4 @@ -# PyLint config for 'gcloud' *library* code. +# PyLint config for 'google-cloud' *library* code. # # NOTES: # diff --git a/scripts/rewrite_imports.py b/scripts/rewrite_imports.py index d8c6c3b7de4d..03128ebe222e 100644 --- a/scripts/rewrite_imports.py +++ b/scripts/rewrite_imports.py @@ -25,10 +25,10 @@ IMPORT_FROM_TEMPLATE = 'from %s import ' REPLACEMENTS = { # Bigtable v2 - 'google.bigtable.v2': 'gcloud.bigtable._generated', - 'google.bigtable.admin.v2': 'gcloud.bigtable._generated', + 'google.bigtable.v2': 'google.cloud.bigtable._generated', + 'google.bigtable.admin.v2': 'google.cloud.bigtable._generated', # Datastore v1 - 'google.datastore.v1': 'gcloud.datastore._generated', + 'google.datastore.v1': 'google.cloud.datastore._generated', } diff --git a/scripts/run_pylint.py b/scripts/run_pylint.py index 80f4468361a6..8f875b7e2748 100644 --- a/scripts/run_pylint.py +++ b/scripts/run_pylint.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -"""Custom script to run PyLint on gcloud codebase. +"""Custom script to run PyLint on google-cloud codebase. This runs pylint as a script via subprocess in two different subprocesses. The first lints the production/library code @@ -31,14 +31,14 @@ IGNORED_DIRECTORIES = [ - os.path.join('gcloud', 'bigtable', '_generated'), - os.path.join('gcloud', 'datastore', '_generated'), + os.path.join('google', 'cloud', 'bigtable', '_generated'), + os.path.join('google', 'cloud', 'datastore', '_generated'), 'scripts/verify_included_modules.py', ] IGNORED_FILES = [ os.path.join('docs', 'conf.py'), 'setup.py', - os.path.join('gcloud', 'vision', '_fixtures.py'), + os.path.join('google', 'cloud', 'vision', '_fixtures.py'), ] SCRIPTS_DIR = os.path.abspath(os.path.dirname(__file__)) PRODUCTION_RC = os.path.join(SCRIPTS_DIR, 'pylintrc_default') @@ -144,8 +144,8 @@ def get_files_for_linting(allow_limited=True): this value is not dependable. To allow faster local ``tox`` runs, the environment variables - ``GCLOUD_REMOTE_FOR_LINT`` and ``GCLOUD_BRANCH_FOR_LINT`` can be set to - specify a remote branch to diff against. + ``GOOGLE_CLOUD_REMOTE_FOR_LINT`` and ``GOOGLE_CLOUD_BRANCH_FOR_LINT`` can + be set to specify a remote branch to diff against. :type allow_limited: bool :param allow_limited: Boolean indicating if a reduced set of files can @@ -163,8 +163,8 @@ def get_files_for_linting(allow_limited=True): diff_base = 'origin/master' elif os.getenv('TRAVIS') is None: # Only allow specified remote and branch in local dev. - remote = os.getenv('GCLOUD_REMOTE_FOR_LINT') - branch = os.getenv('GCLOUD_BRANCH_FOR_LINT') + remote = os.getenv('GOOGLE_CLOUD_REMOTE_FOR_LINT') + branch = os.getenv('GOOGLE_CLOUD_BRANCH_FOR_LINT') if remote is not None and branch is not None: diff_base = '%s/%s' % (remote, branch) diff --git a/scripts/update_json_docs.sh b/scripts/update_json_docs.sh index f6e86c90202f..623b0c478209 100755 --- a/scripts/update_json_docs.sh +++ b/scripts/update_json_docs.sh @@ -57,11 +57,11 @@ buildDocs ${DOC_VERSION} if [ "${TRAVIS_BRANCH}" == "master" ] && [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then pushDocs ${DOC_VERSION} cleanSubmodule - echo "Done pushing docsite. See: https://googlecloudplatform.github.io/gcloud-python/" + echo "Done pushing docsite. See: https://googlecloudplatform.github.io/google-cloud-python/" fi if [[ ! -z ${TRAVIS_TAG} ]]; then pushDocs ${DOC_VERSION} cleanSubmodule - echo "Done pushing docsite. See: https://googlecloudplatform.github.io/gcloud-python/" + echo "Done pushing docsite. See: https://googlecloudplatform.github.io/google-cloud-python/" fi diff --git a/scripts/verify_included_modules.py b/scripts/verify_included_modules.py index c22078c9aad9..a45774239bc0 100644 --- a/scripts/verify_included_modules.py +++ b/scripts/verify_included_modules.py @@ -30,31 +30,31 @@ DOCS_DIR = os.path.join(BASE_DIR, 'docs') IGNORED_PREFIXES = ('test_', '_') IGNORED_MODULES = frozenset([ - 'gcloud.__init__', - 'gcloud.bigquery.__init__', - 'gcloud.bigtable.__init__', - 'gcloud.datastore.__init__', - 'gcloud.dns.__init__', - 'gcloud.error_reporting.__init__', - 'gcloud.iterator', - 'gcloud.language.__init__', - 'gcloud.logging.__init__', - 'gcloud.logging.handlers.__init__', - 'gcloud.logging.handlers.transports.__init__', - 'gcloud.monitoring.__init__', - 'gcloud.pubsub.__init__', - 'gcloud.resource_manager.__init__', - 'gcloud.storage.__init__', - 'gcloud.streaming.__init__', - 'gcloud.streaming.buffered_stream', - 'gcloud.streaming.exceptions', - 'gcloud.streaming.http_wrapper', - 'gcloud.streaming.stream_slice', - 'gcloud.streaming.transfer', - 'gcloud.streaming.util', - 'gcloud.translate.__init__', - 'gcloud.vision.__init__', - 'gcloud.vision.fixtures', + 'google.cloud.__init__', + 'google.cloud.bigquery.__init__', + 'google.cloud.bigtable.__init__', + 'google.cloud.datastore.__init__', + 'google.cloud.dns.__init__', + 'google.cloud.error_reporting.__init__', + 'google.cloud.iterator', + 'google.cloud.language.__init__', + 'google.cloud.logging.__init__', + 'google.cloud.logging.handlers.__init__', + 'google.cloud.logging.handlers.transports.__init__', + 'google.cloud.monitoring.__init__', + 'google.cloud.pubsub.__init__', + 'google.cloud.resource_manager.__init__', + 'google.cloud.storage.__init__', + 'google.cloud.streaming.__init__', + 'google.cloud.streaming.buffered_stream', + 'google.cloud.streaming.exceptions', + 'google.cloud.streaming.http_wrapper', + 'google.cloud.streaming.stream_slice', + 'google.cloud.streaming.transfer', + 'google.cloud.streaming.util', + 'google.cloud.translate.__init__', + 'google.cloud.vision.__init__', + 'google.cloud.vision.fixtures', ]) @@ -133,9 +133,9 @@ def main(build_root='_build'): object_inventory_relpath) sphinx_mods = set(inventory['py:module'].keys()) - library_dir = os.path.join(BASE_DIR, 'gcloud') + library_dir = os.path.join(BASE_DIR, 'google', 'cloud') public_mods = get_public_modules(library_dir, - base_package='gcloud') + base_package='google.cloud') public_mods = set(public_mods) if not sphinx_mods <= public_mods: @@ -163,8 +163,9 @@ def get_parser(): :rtype: :class:`argparse.ArgumentParser` :returns: The parser for this script. """ - parser = argparse.ArgumentParser( - description='Run check that all GCloud modules are included in docs.') + description = ('Run check that all google-cloud ' + 'modules are included in docs.') + parser = argparse.ArgumentParser(description=description) parser.add_argument('--build-root', dest='build_root', help='The root directory where docs are located.') return parser diff --git a/setup.py b/setup.py index d9da90b1f992..c4c8b43891cb 100644 --- a/setup.py +++ b/setup.py @@ -32,14 +32,20 @@ REQUIREMENTS.extend(GRPC_EXTRAS) setup( - name='gcloud', + name='google-cloud', version='0.18.0', description='API Client library for Google Cloud', author='Google Cloud Platform', - author_email='jjg+gcloud-python@google.com', + author_email='jjg+google-cloud-python@google.com', long_description=README, scripts=[], - url='https://github.com/GoogleCloudPlatform/gcloud-python', + url='https://github.com/GoogleCloudPlatform/google-cloud-python', + namespace_packages=[ + 'google', + 'google.cloud', + 'google.cloud.logging', + 'google.cloud.pubsub', + ], packages=find_packages(), license='Apache 2.0', platforms='Posix; MacOS X; Windows', diff --git a/system_tests/bigquery.py b/system_tests/bigquery.py index 46ca200e952f..f87c1ba4fe51 100644 --- a/system_tests/bigquery.py +++ b/system_tests/bigquery.py @@ -16,10 +16,10 @@ import unittest -from gcloud import _helpers -from gcloud.environment_vars import TESTS_PROJECT -from gcloud import bigquery -from gcloud.exceptions import Forbidden +from google.cloud import _helpers +from google.cloud.environment_vars import TESTS_PROJECT +from google.cloud import bigquery +from google.cloud.exceptions import Forbidden from retry import RetryErrors from retry import RetryInstanceState @@ -244,7 +244,7 @@ def test_update_table(self): def test_load_table_then_dump_table(self): import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC NOW_SECONDS = 1448911495.484366 NOW = datetime.datetime.utcfromtimestamp( @@ -294,7 +294,7 @@ def _has_rows(result): def test_load_table_from_storage_then_dump_table(self): import csv import tempfile - from gcloud.storage import Client as StorageClient + from google.cloud.storage import Client as StorageClient local_id = unique_resource_id() BUCKET_NAME = 'bq_load_test' + local_id BLOB_NAME = 'person_ages.csv' diff --git a/system_tests/bigtable.py b/system_tests/bigtable.py index 768893910a29..ea79eaa73fc6 100644 --- a/system_tests/bigtable.py +++ b/system_tests/bigtable.py @@ -17,19 +17,19 @@ import unittest -from gcloud import _helpers -from gcloud._helpers import _datetime_from_microseconds -from gcloud._helpers import _microseconds_from_datetime -from gcloud._helpers import UTC -from gcloud.bigtable.client import Client -from gcloud.bigtable.column_family import MaxVersionsGCRule -from gcloud.bigtable.row_filters import ApplyLabelFilter -from gcloud.bigtable.row_filters import ColumnQualifierRegexFilter -from gcloud.bigtable.row_filters import RowFilterChain -from gcloud.bigtable.row_filters import RowFilterUnion -from gcloud.bigtable.row_data import Cell -from gcloud.bigtable.row_data import PartialRowData -from gcloud.environment_vars import TESTS_PROJECT +from google.cloud import _helpers +from google.cloud._helpers import _datetime_from_microseconds +from google.cloud._helpers import _microseconds_from_datetime +from google.cloud._helpers import UTC +from google.cloud.bigtable.client import Client +from google.cloud.bigtable.column_family import MaxVersionsGCRule +from google.cloud.bigtable.row_filters import ApplyLabelFilter +from google.cloud.bigtable.row_filters import ColumnQualifierRegexFilter +from google.cloud.bigtable.row_filters import RowFilterChain +from google.cloud.bigtable.row_filters import RowFilterUnion +from google.cloud.bigtable.row_data import Cell +from google.cloud.bigtable.row_data import PartialRowData +from google.cloud.environment_vars import TESTS_PROJECT from retry import RetryErrors from retry import RetryResult @@ -37,8 +37,8 @@ LOCATION_ID = 'us-central1-c' -INSTANCE_ID = 'gcloud' + unique_resource_id('-') -TABLE_ID = 'gcloud-python-test-table' +INSTANCE_ID = 'google-cloud' + unique_resource_id('-') +TABLE_ID = 'google-cloud-python-test-table' COLUMN_FAMILY_ID1 = u'col-fam-id1' COLUMN_FAMILY_ID2 = u'col-fam-id2' COL_NAME1 = b'col-name1' @@ -66,7 +66,7 @@ class Config(object): def _wait_until_complete(operation, max_attempts=5): """Wait until an operation has completed. - :type operation: :class:`gcloud.bigtable.instance.Operation` + :type operation: :class:`google.cloud.bigtable.instance.Operation` :param operation: Operation that has not complete. :type max_attempts: int diff --git a/system_tests/clear_datastore.py b/system_tests/clear_datastore.py index 02467b1b9351..8ba286e2359c 100644 --- a/system_tests/clear_datastore.py +++ b/system_tests/clear_datastore.py @@ -20,8 +20,8 @@ import six -from gcloud import datastore -from gcloud.environment_vars import TESTS_PROJECT +from google.cloud import datastore +from google.cloud.environment_vars import TESTS_PROJECT FETCH_MAX = 20 @@ -36,7 +36,7 @@ def print_func(message): - if os.getenv('GCLOUD_NO_PRINT') != 'true': + if os.getenv('GOOGLE_CLOUD_NO_PRINT') != 'true': print(message) diff --git a/system_tests/datastore.py b/system_tests/datastore.py index 5d2d5328938e..11df706286db 100644 --- a/system_tests/datastore.py +++ b/system_tests/datastore.py @@ -18,13 +18,13 @@ import httplib2 -from gcloud import _helpers -from gcloud._helpers import UTC -from gcloud import datastore -from gcloud.datastore.helpers import GeoPoint -from gcloud.environment_vars import GCD_DATASET -from gcloud.environment_vars import TESTS_PROJECT -from gcloud.exceptions import Conflict +from google.cloud import _helpers +from google.cloud._helpers import UTC +from google.cloud import datastore +from google.cloud.datastore.helpers import GeoPoint +from google.cloud.environment_vars import GCD_DATASET +from google.cloud.environment_vars import TESTS_PROJECT +from google.cloud.exceptions import Conflict import clear_datastore import populate_datastore @@ -433,7 +433,8 @@ def test_transaction_via_with_statement(self): self.assertEqual(retrieved_entity, entity) def test_transaction_via_explicit_begin_get_commit(self): - # See https://github.com/GoogleCloudPlatform/gcloud-python/issues/1859 + # See + # github.com/GoogleCloudPlatform/google-cloud-python/issues/1859 # Note that this example lacks the threading which provokes the race # condition in that issue: we are basically just exercising the # "explict" path for using transactions. diff --git a/system_tests/language.py b/system_tests/language.py index 89e1832e0182..267e361f642d 100644 --- a/system_tests/language.py +++ b/system_tests/language.py @@ -14,11 +14,11 @@ import unittest -from gcloud import _helpers -from gcloud.environment_vars import TESTS_PROJECT -from gcloud import exceptions -from gcloud import language -from gcloud import storage +from google.cloud import _helpers +from google.cloud.environment_vars import TESTS_PROJECT +from google.cloud import exceptions +from google.cloud import language +from google.cloud import storage from system_test_utils import unique_resource_id from retry import RetryErrors @@ -67,7 +67,7 @@ def tearDown(self): value.delete() def _check_analyze_entities_result(self, entities): - from gcloud.language.entity import EntityType + from google.cloud.language.entity import EntityType self.assertEqual(len(entities), 3) entity1, entity2, entity3 = entities diff --git a/system_tests/local_test_setup.sample b/system_tests/local_test_setup.sample index 771638c56985..8e4ff000a097 100644 --- a/system_tests/local_test_setup.sample +++ b/system_tests/local_test_setup.sample @@ -1,4 +1,4 @@ export GOOGLE_APPLICATION_CREDENTIALS="app_credentials.json.sample" -export GCLOUD_TESTS_PROJECT_ID="my-project" -export GCLOUD_REMOTE_FOR_LINT="upstream" -export GCLOUD_BRANCH_FOR_LINT="master" +export GOOGLE_CLOUD_TESTS_PROJECT_ID="my-project" +export GOOGLE_CLOUD_REMOTE_FOR_LINT="upstream" +export GOOGLE_CLOUD_BRANCH_FOR_LINT="master" diff --git a/system_tests/logging_.py b/system_tests/logging_.py index 98529b6ed17d..a39ee97ad106 100644 --- a/system_tests/logging_.py +++ b/system_tests/logging_.py @@ -15,12 +15,12 @@ import logging import unittest -import gcloud.logging -import gcloud.logging.handlers.handlers -from gcloud.logging.handlers.handlers import CloudLoggingHandler -from gcloud.logging.handlers.transports import SyncTransport -from gcloud import _helpers -from gcloud.environment_vars import TESTS_PROJECT +import google.cloud.logging +import google.cloud.logging.handlers.handlers +from google.cloud.logging.handlers.handlers import CloudLoggingHandler +from google.cloud.logging.handlers.transports import SyncTransport +from google.cloud import _helpers +from google.cloud.environment_vars import TESTS_PROJECT from retry import RetryErrors from retry import RetryResult @@ -31,9 +31,9 @@ DEFAULT_SINK_NAME = 'system-tests-sink%s' % (_RESOURCE_ID,) DEFAULT_FILTER = 'logName:syslog AND severity>=INFO' DEFAULT_DESCRIPTION = 'System testing' -BUCKET_NAME = 'gcloud-python-system-testing%s' % (_RESOURCE_ID,) +BUCKET_NAME = 'google-cloud-python-system-testing%s' % (_RESOURCE_ID,) DATASET_NAME = ('system_testing_dataset' + _RESOURCE_ID).replace('-', '_') -TOPIC_NAME = 'gcloud-python-system-testing%s' % (_RESOURCE_ID,) +TOPIC_NAME = 'google-cloud-python-system-testing%s' % (_RESOURCE_ID,) def _retry_on_unavailable(exc): @@ -57,7 +57,7 @@ class Config(object): def setUpModule(): _helpers.PROJECT = TESTS_PROJECT - Config.CLIENT = gcloud.logging.Client() + Config.CLIENT = google.cloud.logging.Client() class TestLogging(unittest.TestCase): @@ -67,7 +67,7 @@ def setUp(self): self._handlers_cache = logging.getLogger().handlers[:] def tearDown(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound retry = RetryErrors(NotFound) for doomed in self.to_delete: retry(doomed.delete)() @@ -188,7 +188,7 @@ def test_log_root_handler(self): logger = Config.CLIENT.logger(handler.name) self.to_delete.append(logger) - gcloud.logging.handlers.handlers.setup_logging(handler) + google.cloud.logging.handlers.handlers.setup_logging(handler) logging.warn(LOG_MESSAGE) entries, _ = self._list_entries(logger) @@ -254,7 +254,7 @@ def test_list_metrics(self): set([DEFAULT_METRIC_NAME])) def test_reload_metric(self): - from gcloud.exceptions import Conflict + from google.cloud.exceptions import Conflict retry = RetryErrors(Conflict) metric = Config.CLIENT.metric( DEFAULT_METRIC_NAME, DEFAULT_FILTER, DEFAULT_DESCRIPTION) @@ -268,7 +268,7 @@ def test_reload_metric(self): self.assertEqual(metric.description, DEFAULT_DESCRIPTION) def test_update_metric(self): - from gcloud.exceptions import Conflict + from google.cloud.exceptions import Conflict retry = RetryErrors(Conflict) NEW_FILTER = 'logName:other' NEW_DESCRIPTION = 'updated' @@ -287,7 +287,7 @@ def test_update_metric(self): self.assertEqual(after.description, NEW_DESCRIPTION) def _init_storage_bucket(self): - from gcloud import storage + from google.cloud import storage BUCKET_URI = 'storage.googleapis.com/%s' % (BUCKET_NAME,) # Create the destination bucket, and set up the ACL to allow @@ -313,7 +313,7 @@ def test_create_sink_storage_bucket(self): self.assertTrue(sink.exists()) def test_create_sink_pubsub_topic(self): - from gcloud import pubsub + from google.cloud import pubsub # Create the destination topic, and set up the IAM policy to allow # Stackdriver Logging to write into it. @@ -335,8 +335,8 @@ def test_create_sink_pubsub_topic(self): self.assertTrue(sink.exists()) def _init_bigquery_dataset(self): - from gcloud import bigquery - from gcloud.bigquery.dataset import AccessGrant + from google.cloud import bigquery + from google.cloud.bigquery.dataset import AccessGrant DATASET_URI = 'bigquery.googleapis.com/projects/%s/datasets/%s' % ( Config.CLIENT.project, DATASET_NAME,) @@ -377,7 +377,7 @@ def test_list_sinks(self): set([DEFAULT_SINK_NAME])) def test_reload_sink(self): - from gcloud.exceptions import Conflict + from google.cloud.exceptions import Conflict retry = RetryErrors(Conflict) uri = self._init_bigquery_dataset() sink = Config.CLIENT.sink(DEFAULT_SINK_NAME, DEFAULT_FILTER, uri) @@ -391,7 +391,7 @@ def test_reload_sink(self): self.assertEqual(sink.destination, uri) def test_update_sink(self): - from gcloud.exceptions import Conflict + from google.cloud.exceptions import Conflict retry = RetryErrors(Conflict) bucket_uri = self._init_storage_bucket() dataset_uri = self._init_bigquery_dataset() diff --git a/system_tests/monitoring.py b/system_tests/monitoring.py index 52e2bb0912d7..e68f906b37d0 100644 --- a/system_tests/monitoring.py +++ b/system_tests/monitoring.py @@ -14,12 +14,12 @@ import unittest -from gcloud import _helpers -from gcloud.environment_vars import TESTS_PROJECT -from gcloud.exceptions import InternalServerError -from gcloud.exceptions import NotFound -from gcloud.exceptions import ServiceUnavailable -from gcloud import monitoring +from google.cloud import _helpers +from google.cloud.environment_vars import TESTS_PROJECT +from google.cloud.exceptions import InternalServerError +from google.cloud.exceptions import NotFound +from google.cloud.exceptions import ServiceUnavailable +from google.cloud import monitoring from retry import RetryErrors from system_test_utils import unique_resource_id diff --git a/system_tests/populate_datastore.py b/system_tests/populate_datastore.py index a4e68d1a5e8b..5ba70ffc5659 100644 --- a/system_tests/populate_datastore.py +++ b/system_tests/populate_datastore.py @@ -21,8 +21,8 @@ import six -from gcloud import datastore -from gcloud.environment_vars import TESTS_PROJECT +from google.cloud import datastore +from google.cloud.environment_vars import TESTS_PROJECT ANCESTOR = ('Book', 'GoT') @@ -84,7 +84,7 @@ def print_func(message): - if os.getenv('GCLOUD_NO_PRINT') != 'true': + if os.getenv('GOOGLE_CLOUD_NO_PRINT') != 'true': print(message) diff --git a/system_tests/pubsub.py b/system_tests/pubsub.py index b38b7facbd50..99864fb8fcff 100644 --- a/system_tests/pubsub.py +++ b/system_tests/pubsub.py @@ -20,10 +20,12 @@ from grpc._channel import _Rendezvous import httplib2 -from gcloud import _helpers -from gcloud.environment_vars import PUBSUB_EMULATOR -from gcloud.environment_vars import TESTS_PROJECT -from gcloud import pubsub +# pylint: disable=ungrouped-imports +from google.cloud import _helpers +from google.cloud.environment_vars import PUBSUB_EMULATOR +from google.cloud.environment_vars import TESTS_PROJECT +from google.cloud import pubsub +# pylint: enable=ungrouped-imports from retry import RetryInstanceState from retry import RetryResult @@ -213,7 +215,7 @@ def _maybe_emulator_skip(self): self.skipTest('IAM not supported by Pub/Sub emulator') def test_topic_iam_policy(self): - from gcloud.pubsub.iam import PUBSUB_TOPICS_GET_IAM_POLICY + from google.cloud.pubsub.iam import PUBSUB_TOPICS_GET_IAM_POLICY self._maybe_emulator_skip() topic_name = 'test-topic-iam-policy-topic' + unique_resource_id('-') topic = Config.CLIENT.topic(topic_name) @@ -233,7 +235,7 @@ def test_topic_iam_policy(self): self.assertEqual(new_policy.viewers, policy.viewers) def test_subscription_iam_policy(self): - from gcloud.pubsub.iam import PUBSUB_SUBSCRIPTIONS_GET_IAM_POLICY + from google.cloud.pubsub.iam import PUBSUB_SUBSCRIPTIONS_GET_IAM_POLICY self._maybe_emulator_skip() topic_name = 'test-sub-iam-policy-topic' + unique_resource_id('-') topic = Config.CLIENT.topic(topic_name) @@ -264,10 +266,10 @@ def test_subscription_iam_policy(self): self.assertEqual(new_policy.viewers, policy.viewers) # This test is ultra-flaky. See: - # https://github.com/GoogleCloudPlatform/gcloud-python/issues/2080 + # https://github.com/GoogleCloudPlatform/google-cloud-python/issues/2080 @unittest.expectedFailure def test_fetch_delete_subscription_w_deleted_topic(self): - from gcloud.iterator import MethodIterator + from google.cloud.iterator import MethodIterator TO_DELETE = 'delete-me' + unique_resource_id('-') ORPHANED = 'orphaned' + unique_resource_id('-') topic = Config.CLIENT.topic(TO_DELETE) diff --git a/system_tests/run_emulator.py b/system_tests/run_emulator.py index c3ea8fdcc602..5d946a1aac83 100644 --- a/system_tests/run_emulator.py +++ b/system_tests/run_emulator.py @@ -25,9 +25,9 @@ import psutil -from gcloud.environment_vars import GCD_DATASET -from gcloud.environment_vars import GCD_HOST -from gcloud.environment_vars import PUBSUB_EMULATOR +from google.cloud.environment_vars import GCD_DATASET +from google.cloud.environment_vars import GCD_HOST +from google.cloud.environment_vars import PUBSUB_EMULATOR from run_system_test import run_module_tests @@ -46,7 +46,7 @@ def get_parser(): :returns: The parser for this script. """ parser = argparse.ArgumentParser( - description='Run GCloud system tests against local emulator.') + description='Run google-cloud system tests against local emulator.') parser.add_argument('--package', dest='package', choices=('datastore', 'pubsub'), default='datastore', help='Package to be tested.') diff --git a/system_tests/run_system_test.py b/system_tests/run_system_test.py index d3593db8be22..4ee50f9514f8 100644 --- a/system_tests/run_system_test.py +++ b/system_tests/run_system_test.py @@ -47,7 +47,7 @@ class FailedSystemTestModule(Exception): def get_parser(): parser = argparse.ArgumentParser( - description='GCloud test runner against actual project.') + description='google-cloud test runner against actual project.') parser.add_argument('--package', dest='package', choices=TEST_MODULES.keys(), default='datastore', help='Package to be tested.') diff --git a/system_tests/storage.py b/system_tests/storage.py index 0d12f7a57ea4..5ff0ed7828a6 100644 --- a/system_tests/storage.py +++ b/system_tests/storage.py @@ -20,11 +20,11 @@ import httplib2 import six -from gcloud import _helpers -from gcloud.environment_vars import TESTS_PROJECT -from gcloud import exceptions -from gcloud import storage -from gcloud.storage._helpers import _base64_md5hash +from google.cloud import _helpers +from google.cloud.environment_vars import TESTS_PROJECT +from google.cloud import exceptions +from google.cloud import storage +from google.cloud.storage._helpers import _base64_md5hash from system_test_utils import unique_resource_id from retry import RetryErrors diff --git a/system_tests/system_test_utils.py b/system_tests/system_test_utils.py index dc36ef33a262..00d51d98550e 100644 --- a/system_tests/system_test_utils.py +++ b/system_tests/system_test_utils.py @@ -17,8 +17,8 @@ import sys import time -from gcloud.environment_vars import CREDENTIALS as TEST_CREDENTIALS -from gcloud.environment_vars import TESTS_PROJECT +from google.cloud.environment_vars import CREDENTIALS as TEST_CREDENTIALS +from google.cloud.environment_vars import TESTS_PROJECT # From shell environ. May be None. diff --git a/system_tests/translate.py b/system_tests/translate.py index 9bc7b0e0b4e7..16a99fb55e6b 100644 --- a/system_tests/translate.py +++ b/system_tests/translate.py @@ -17,10 +17,10 @@ import unittest -from gcloud import translate +from google.cloud import translate -ENV_VAR = 'GCLOUD_TESTS_API_KEY' +ENV_VAR = 'GOOGLE_CLOUD_TESTS_API_KEY' class Config(object): diff --git a/tox.ini b/tox.ini index e4c3eb7aea4a..5128f7160987 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ deps = pytest covercmd = py.test \ - --cov=gcloud \ + --cov=google.cloud \ --cov=unit_tests \ --cov-config {toxinidir}/.coveragerc \ unit_tests @@ -88,7 +88,7 @@ deps = passenv = {[testenv:system-tests]passenv} SPHINX_RELEASE READTHEDOCS [pep8] -exclude = docs/conf.py,gcloud/bigtable/_generated*/*,gcloud/datastore/_generated/* +exclude = docs/conf.py,google/cloud/bigtable/_generated*/*,google/cloud/datastore/_generated/* verbose = 1 [testenv:lint] @@ -108,7 +108,7 @@ basepython = python2.7 commands = python {toxinidir}/system_tests/attempt_system_tests.py -passenv = GOOGLE_* GCLOUD_* TRAVIS* encrypted_* +passenv = GOOGLE_* GOOGLE_CLOUD_* TRAVIS* encrypted_* [testenv:system-tests3] basepython = @@ -123,7 +123,7 @@ basepython = commands = python {toxinidir}/system_tests/run_emulator.py --package=datastore setenv = - GCLOUD_NO_PRINT=true + GOOGLE_CLOUD_NO_PRINT=true deps = {[testenv]deps} psutil @@ -133,5 +133,5 @@ basepython = python2.7 commands = python {toxinidir}/system_tests/run_emulator.py --package=pubsub -passenv = GCLOUD_* +passenv = GOOGLE_CLOUD_* deps = {[testenv:datastore-emulator]deps} diff --git a/unit_tests/bigquery/test__helpers.py b/unit_tests/bigquery/test__helpers.py index eeb8e5552508..6521a6338b23 100644 --- a/unit_tests/bigquery/test__helpers.py +++ b/unit_tests/bigquery/test__helpers.py @@ -18,7 +18,7 @@ class Test_ConfigurationProperty(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigquery._helpers import _ConfigurationProperty + from google.cloud.bigquery._helpers import _ConfigurationProperty return _ConfigurationProperty def _makeOne(self, *args, **kw): @@ -53,7 +53,7 @@ def __init__(self): class Test_TypedProperty(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigquery._helpers import _TypedProperty + from google.cloud.bigquery._helpers import _TypedProperty return _TypedProperty def _makeOne(self, *args, **kw): @@ -86,7 +86,7 @@ def __init__(self): class Test_EnumProperty(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigquery._helpers import _EnumProperty + from google.cloud.bigquery._helpers import _EnumProperty return _EnumProperty def test_it(self): diff --git a/unit_tests/bigquery/test_client.py b/unit_tests/bigquery/test_client.py index 8783dc8afcbc..8057115794a3 100644 --- a/unit_tests/bigquery/test_client.py +++ b/unit_tests/bigquery/test_client.py @@ -18,14 +18,14 @@ class TestClient(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigquery.client import Client + from google.cloud.bigquery.client import Client return Client def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) def test_ctor(self): - from gcloud.bigquery.connection import Connection + from google.cloud.bigquery.connection import Connection PROJECT = 'PROJECT' creds = _Credentials() http = object() @@ -35,7 +35,7 @@ def test_ctor(self): self.assertTrue(client.connection.http is http) def test_list_datasets_defaults(self): - from gcloud.bigquery.dataset import Dataset + from google.cloud.bigquery.dataset import Dataset PROJECT = 'PROJECT' DATASET_1 = 'dataset_one' DATASET_2 = 'dataset_two' @@ -97,7 +97,7 @@ def test_list_datasets_explicit_response_missing_datasets_key(self): {'all': True, 'maxResults': 3, 'pageToken': TOKEN}) def test_dataset(self): - from gcloud.bigquery.dataset import Dataset + from google.cloud.bigquery.dataset import Dataset PROJECT = 'PROJECT' DATASET = 'dataset_name' creds = _Credentials() @@ -116,10 +116,10 @@ def test_job_from_resource_unknown_type(self): client.job_from_resource({'configuration': {'nonesuch': {}}}) def test_list_jobs_defaults(self): - from gcloud.bigquery.job import LoadTableFromStorageJob - from gcloud.bigquery.job import CopyJob - from gcloud.bigquery.job import ExtractTableToStorageJob - from gcloud.bigquery.job import QueryJob + from google.cloud.bigquery.job import LoadTableFromStorageJob + from google.cloud.bigquery.job import CopyJob + from google.cloud.bigquery.job import ExtractTableToStorageJob + from google.cloud.bigquery.job import QueryJob PROJECT = 'PROJECT' DATASET = 'test_dataset' SOURCE_TABLE = 'source_table' @@ -243,7 +243,7 @@ def test_list_jobs_defaults(self): self.assertEqual(req['query_params'], {'projection': 'full'}) def test_list_jobs_load_job_wo_sourceUris(self): - from gcloud.bigquery.job import LoadTableFromStorageJob + from google.cloud.bigquery.job import LoadTableFromStorageJob PROJECT = 'PROJECT' DATASET = 'test_dataset' SOURCE_TABLE = 'source_table' @@ -321,7 +321,7 @@ def test_list_jobs_explicit_missing(self): 'stateFilter': 'done'}) def test_load_table_from_storage(self): - from gcloud.bigquery.job import LoadTableFromStorageJob + from google.cloud.bigquery.job import LoadTableFromStorageJob PROJECT = 'PROJECT' JOB = 'job_name' DATASET = 'dataset_name' @@ -340,7 +340,7 @@ def test_load_table_from_storage(self): self.assertTrue(job.destination is destination) def test_copy_table(self): - from gcloud.bigquery.job import CopyJob + from google.cloud.bigquery.job import CopyJob PROJECT = 'PROJECT' JOB = 'job_name' DATASET = 'dataset_name' @@ -360,7 +360,7 @@ def test_copy_table(self): self.assertTrue(job.destination is destination) def test_extract_table_to_storage(self): - from gcloud.bigquery.job import ExtractTableToStorageJob + from google.cloud.bigquery.job import ExtractTableToStorageJob PROJECT = 'PROJECT' JOB = 'job_name' DATASET = 'dataset_name' @@ -379,7 +379,7 @@ def test_extract_table_to_storage(self): self.assertEqual(list(job.destination_uris), [DESTINATION]) def test_run_async_query(self): - from gcloud.bigquery.job import QueryJob + from google.cloud.bigquery.job import QueryJob PROJECT = 'PROJECT' JOB = 'job_name' QUERY = 'select count(*) from persons' @@ -393,7 +393,7 @@ def test_run_async_query(self): self.assertEqual(job.query, QUERY) def test_run_sync_query(self): - from gcloud.bigquery.query import QueryResults + from google.cloud.bigquery.query import QueryResults PROJECT = 'PROJECT' QUERY = 'select count(*) from persons' creds = _Credentials() diff --git a/unit_tests/bigquery/test_connection.py b/unit_tests/bigquery/test_connection.py index a53da3dba56e..4fd8cfc0ddaf 100644 --- a/unit_tests/bigquery/test_connection.py +++ b/unit_tests/bigquery/test_connection.py @@ -18,7 +18,7 @@ class TestConnection(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigquery.connection import Connection + from google.cloud.bigquery.connection import Connection return Connection def _makeOne(self, *args, **kw): diff --git a/unit_tests/bigquery/test_dataset.py b/unit_tests/bigquery/test_dataset.py index 79451ae0fb19..cc042e420e75 100644 --- a/unit_tests/bigquery/test_dataset.py +++ b/unit_tests/bigquery/test_dataset.py @@ -18,7 +18,7 @@ class TestAccessGrant(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigquery.dataset import AccessGrant + from google.cloud.bigquery.dataset import AccessGrant return AccessGrant def _makeOne(self, *args, **kw): @@ -81,7 +81,7 @@ class TestDataset(unittest.TestCase): DS_NAME = 'dataset-name' def _getTargetClass(self): - from gcloud.bigquery.dataset import Dataset + from google.cloud.bigquery.dataset import Dataset return Dataset def _makeOne(self, *args, **kw): @@ -89,7 +89,7 @@ def _makeOne(self, *args, **kw): def _setUpConstants(self): import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC self.WHEN_TS = 1437767599.006 self.WHEN = datetime.datetime.utcfromtimestamp(self.WHEN_TS).replace( @@ -201,7 +201,7 @@ def test_access_roles_setter_non_list(self): dataset.access_grants = object() def test_access_roles_setter_invalid_field(self): - from gcloud.bigquery.dataset import AccessGrant + from google.cloud.bigquery.dataset import AccessGrant client = _Client(self.PROJECT) dataset = self._makeOne(self.DS_NAME, client) phred = AccessGrant('OWNER', 'userByEmail', 'phred@example.com') @@ -209,7 +209,7 @@ def test_access_roles_setter_invalid_field(self): dataset.access_grants = [phred, object()] def test_access_roles_setter(self): - from gcloud.bigquery.dataset import AccessGrant + from google.cloud.bigquery.dataset import AccessGrant client = _Client(self.PROJECT) dataset = self._makeOne(self.DS_NAME, client) phred = AccessGrant('OWNER', 'userByEmail', 'phred@example.com') @@ -340,7 +340,7 @@ def test_create_w_bound_client(self): self._verifyResourceProperties(dataset, RESOURCE) def test_create_w_alternate_client(self): - from gcloud.bigquery.dataset import AccessGrant + from google.cloud.bigquery.dataset import AccessGrant PATH = 'projects/%s/datasets' % self.PROJECT USER_EMAIL = 'phred@example.com' GROUP_EMAIL = 'group-name@lists.example.com' @@ -649,7 +649,7 @@ def test_list_tables_empty(self): self.assertEqual(req['path'], '/%s' % PATH) def test_list_tables_defaults(self): - from gcloud.bigquery.table import Table + from google.cloud.bigquery.table import Table TABLE_1 = 'table_one' TABLE_2 = 'table_two' @@ -692,7 +692,7 @@ def test_list_tables_defaults(self): self.assertEqual(req['path'], '/%s' % PATH) def test_list_tables_explicit(self): - from gcloud.bigquery.table import Table + from google.cloud.bigquery.table import Table TABLE_1 = 'table_one' TABLE_2 = 'table_two' @@ -736,7 +736,7 @@ def test_list_tables_explicit(self): {'maxResults': 3, 'pageToken': TOKEN}) def test_table_wo_schema(self): - from gcloud.bigquery.table import Table + from google.cloud.bigquery.table import Table conn = _Connection({}) client = _Client(project=self.PROJECT, connection=conn) dataset = self._makeOne(self.DS_NAME, client=client) @@ -747,8 +747,8 @@ def test_table_wo_schema(self): self.assertEqual(table.schema, []) def test_table_w_schema(self): - from gcloud.bigquery.schema import SchemaField - from gcloud.bigquery.table import Table + from google.cloud.bigquery.schema import SchemaField + from google.cloud.bigquery.table import Table conn = _Connection({}) client = _Client(project=self.PROJECT, connection=conn) dataset = self._makeOne(self.DS_NAME, client=client) @@ -775,7 +775,7 @@ def __init__(self, *responses): self._requested = [] def api_request(self, **kw): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._requested.append(kw) try: diff --git a/unit_tests/bigquery/test_job.py b/unit_tests/bigquery/test_job.py index e488debeb51a..d233c7c0702e 100644 --- a/unit_tests/bigquery/test_job.py +++ b/unit_tests/bigquery/test_job.py @@ -18,7 +18,7 @@ class Test_UDFResourcesProperty(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigquery.job import UDFResourcesProperty + from google.cloud.bigquery.job import UDFResourcesProperty return UDFResourcesProperty def _makeOne(self, *args, **kw): @@ -43,7 +43,7 @@ def test_instance_getter_empty(self): self.assertEqual(instance.udf_resources, []) def test_instance_getter_w_non_empty_list(self): - from gcloud.bigquery.job import UDFResource + from google.cloud.bigquery.job import UDFResource RESOURCE_URI = 'gs://some-bucket/js/lib.js' udf_resources = [UDFResource("resourceUri", RESOURCE_URI)] _, klass = self._descriptor_and_klass() @@ -53,7 +53,7 @@ def test_instance_getter_w_non_empty_list(self): self.assertEqual(instance.udf_resources, udf_resources) def test_instance_setter_w_empty_list(self): - from gcloud.bigquery.job import UDFResource + from google.cloud.bigquery.job import UDFResource RESOURCE_URI = 'gs://some-bucket/js/lib.js' udf_resources = [UDFResource("resourceUri", RESOURCE_URI)] _, klass = self._descriptor_and_klass() @@ -65,7 +65,7 @@ def test_instance_setter_w_empty_list(self): self.assertEqual(instance.udf_resources, []) def test_instance_setter_w_valid_udf(self): - from gcloud.bigquery.job import UDFResource + from google.cloud.bigquery.job import UDFResource RESOURCE_URI = 'gs://some-bucket/js/lib.js' udf_resources = [UDFResource("resourceUri", RESOURCE_URI)] _, klass = self._descriptor_and_klass() @@ -97,7 +97,7 @@ def _makeOne(self, *args, **kw): def _setUpConstants(self): import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC self.WHEN_TS = 1437767599.006 self.WHEN = datetime.datetime.utcfromtimestamp(self.WHEN_TS).replace( @@ -193,7 +193,7 @@ class TestLoadTableFromStorageJob(unittest.TestCase, _Base): JOB_TYPE = 'load' def _getTargetClass(self): - from gcloud.bigquery.job import LoadTableFromStorageJob + from google.cloud.bigquery.job import LoadTableFromStorageJob return LoadTableFromStorageJob def _setUpConstants(self): @@ -332,7 +332,7 @@ def test_ctor(self): self.assertTrue(job.write_disposition is None) def test_ctor_w_schema(self): - from gcloud.bigquery.schema import SchemaField + from google.cloud.bigquery.schema import SchemaField client = _Client(self.PROJECT) table = _Table() full_name = SchemaField('full_name', 'STRING', mode='REQUIRED') @@ -349,7 +349,7 @@ def test_schema_setter_non_list(self): job.schema = object() def test_schema_setter_invalid_field(self): - from gcloud.bigquery.schema import SchemaField + from google.cloud.bigquery.schema import SchemaField client = _Client(self.PROJECT) table = _Table() job = self._makeOne(self.JOB_NAME, table, [self.SOURCE1], client) @@ -358,7 +358,7 @@ def test_schema_setter_invalid_field(self): job.schema = [full_name, object()] def test_schema_setter(self): - from gcloud.bigquery.schema import SchemaField + from google.cloud.bigquery.schema import SchemaField client = _Client(self.PROJECT) table = _Table() job = self._makeOne(self.JOB_NAME, table, [self.SOURCE1], client) @@ -369,8 +369,8 @@ def test_schema_setter(self): def test_props_set_by_server(self): import datetime - from gcloud._helpers import UTC - from gcloud._helpers import _millis + from google.cloud._helpers import UTC + from google.cloud._helpers import _millis CREATED = datetime.datetime(2015, 8, 11, 12, 13, 22, tzinfo=UTC) STARTED = datetime.datetime(2015, 8, 11, 13, 47, 15, tzinfo=UTC) @@ -523,7 +523,7 @@ def test_begin_w_bound_client(self): self._verifyResourceProperties(job, RESOURCE) def test_begin_w_alternate_client(self): - from gcloud.bigquery.schema import SchemaField + from google.cloud.bigquery.schema import SchemaField PATH = 'projects/%s/jobs' % self.PROJECT RESOURCE = self._makeResource(ended=True) LOAD_CONFIGURATION = { @@ -701,7 +701,7 @@ class TestCopyJob(unittest.TestCase, _Base): DESTINATION_TABLE = 'destination_table' def _getTargetClass(self): - from gcloud.bigquery.job import CopyJob + from google.cloud.bigquery.job import CopyJob return CopyJob def _makeResource(self, started=False, ended=False): @@ -998,7 +998,7 @@ class TestExtractTableToStorageJob(unittest.TestCase, _Base): DESTINATION_URI = 'gs://bucket_name/object_name' def _getTargetClass(self): - from gcloud.bigquery.job import ExtractTableToStorageJob + from google.cloud.bigquery.job import ExtractTableToStorageJob return ExtractTableToStorageJob def _makeResource(self, started=False, ended=False): @@ -1291,7 +1291,7 @@ class TestQueryJob(unittest.TestCase, _Base): DESTINATION_TABLE = 'destination_table' def _getTargetClass(self): - from gcloud.bigquery.job import QueryJob + from google.cloud.bigquery.job import QueryJob return QueryJob def _makeResource(self, started=False, ended=False): @@ -1474,8 +1474,8 @@ def test_begin_w_bound_client(self): self._verifyResourceProperties(job, RESOURCE) def test_begin_w_alternate_client(self): - from gcloud.bigquery.dataset import Dataset - from gcloud.bigquery.dataset import Table + from google.cloud.bigquery.dataset import Dataset + from google.cloud.bigquery.dataset import Table PATH = 'projects/%s/jobs' % self.PROJECT TABLE = 'TABLE' DS_NAME = 'DATASET' @@ -1539,7 +1539,7 @@ def test_begin_w_alternate_client(self): self._verifyResourceProperties(job, RESOURCE) def test_begin_w_bound_client_and_udf(self): - from gcloud.bigquery.job import UDFResource + from google.cloud.bigquery.job import UDFResource RESOURCE_URI = 'gs://some-bucket/js/lib.js' PATH = 'projects/%s/jobs' % self.PROJECT RESOURCE = self._makeResource() @@ -1611,8 +1611,8 @@ def test_exists_hit_w_alternate_client(self): self.assertEqual(req['query_params'], {'fields': 'id'}) def test_reload_w_bound_client(self): - from gcloud.bigquery.dataset import Dataset - from gcloud.bigquery.dataset import Table + from google.cloud.bigquery.dataset import Dataset + from google.cloud.bigquery.dataset import Table PATH = 'projects/%s/jobs/%s' % (self.PROJECT, self.JOB_NAME) DS_NAME = 'DATASET' DEST_TABLE = 'dest_table' @@ -1669,7 +1669,7 @@ def __init__(self, project='project', connection=None): self.connection = connection def dataset(self, name): - from gcloud.bigquery.dataset import Dataset + from google.cloud.bigquery.dataset import Dataset return Dataset(name, client=self) @@ -1700,7 +1700,7 @@ def __init__(self, *responses): self._requested = [] def api_request(self, **kw): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._requested.append(kw) try: diff --git a/unit_tests/bigquery/test_query.py b/unit_tests/bigquery/test_query.py index 4d4d73ee1090..f7ff8468c11e 100644 --- a/unit_tests/bigquery/test_query.py +++ b/unit_tests/bigquery/test_query.py @@ -24,7 +24,7 @@ class TestQueryResults(unittest.TestCase): TOKEN = 'TOKEN' def _getTargetClass(self): - from gcloud.bigquery.query import QueryResults + from google.cloud.bigquery.query import QueryResults return QueryResults def _makeOne(self, *args, **kw): @@ -73,7 +73,7 @@ def _makeResource(self, complete=False): return resource def _verifySchema(self, query, resource): - from gcloud.bigquery.schema import SchemaField + from google.cloud.bigquery.schema import SchemaField if 'schema' in resource: fields = resource['schema']['fields'] self.assertEqual(len(query.schema), len(fields)) @@ -144,7 +144,7 @@ def test_job_wo_jobid(self): self.assertTrue(query.job is None) def test_job_w_jobid(self): - from gcloud.bigquery.job import QueryJob + from google.cloud.bigquery.job import QueryJob SERVER_GENERATED = 'SERVER_GENERATED' client = _Client(self.PROJECT) query = self._makeOne(self.QUERY, client) @@ -234,7 +234,7 @@ def test_run_w_alternate_client(self): self._verifyResourceProperties(query, RESOURCE) def test_run_w_inline_udf(self): - from gcloud.bigquery.job import UDFResource + from google.cloud.bigquery.job import UDFResource INLINE_UDF_CODE = 'var someCode = "here";' PATH = 'projects/%s/queries' % self.PROJECT RESOURCE = self._makeResource(complete=False) @@ -256,7 +256,7 @@ def test_run_w_inline_udf(self): self._verifyResourceProperties(query, RESOURCE) def test_run_w_udf_resource_uri(self): - from gcloud.bigquery.job import UDFResource + from google.cloud.bigquery.job import UDFResource RESOURCE_URI = 'gs://some-bucket/js/lib.js' PATH = 'projects/%s/queries' % self.PROJECT RESOURCE = self._makeResource(complete=False) @@ -278,7 +278,7 @@ def test_run_w_udf_resource_uri(self): self._verifyResourceProperties(query, RESOURCE) def test_run_w_mixed_udfs(self): - from gcloud.bigquery.job import UDFResource + from google.cloud.bigquery.job import UDFResource RESOURCE_URI = 'gs://some-bucket/js/lib.js' INLINE_UDF_CODE = 'var someCode = "here";' PATH = 'projects/%s/queries' % self.PROJECT @@ -388,7 +388,7 @@ def __init__(self, project='project', connection=None): self.connection = connection def dataset(self, name): - from gcloud.bigquery.dataset import Dataset + from google.cloud.bigquery.dataset import Dataset return Dataset(name, client=self) diff --git a/unit_tests/bigquery/test_schema.py b/unit_tests/bigquery/test_schema.py index 44cd8816e277..eba85a078b81 100644 --- a/unit_tests/bigquery/test_schema.py +++ b/unit_tests/bigquery/test_schema.py @@ -18,7 +18,7 @@ class TestSchemaField(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigquery.schema import SchemaField + from google.cloud.bigquery.schema import SchemaField return SchemaField def _makeOne(self, *args, **kw): diff --git a/unit_tests/bigquery/test_table.py b/unit_tests/bigquery/test_table.py index b5da81f61079..075fc951bd19 100644 --- a/unit_tests/bigquery/test_table.py +++ b/unit_tests/bigquery/test_table.py @@ -36,7 +36,7 @@ class TestTable(unittest.TestCase, _SchemaBase): TABLE_NAME = 'table-name' def _getTargetClass(self): - from gcloud.bigquery.table import Table + from google.cloud.bigquery.table import Table return Table def _makeOne(self, *args, **kw): @@ -44,7 +44,7 @@ def _makeOne(self, *args, **kw): def _setUpConstants(self): import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC self.WHEN_TS = 1437767599.006 self.WHEN = datetime.datetime.utcfromtimestamp(self.WHEN_TS).replace( @@ -160,7 +160,7 @@ def test_ctor(self): self.assertEqual(table.view_query, None) def test_ctor_w_schema(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField client = _Client(self.PROJECT) dataset = _Dataset(client) full_name = SchemaField('full_name', 'STRING', mode='REQUIRED') @@ -221,7 +221,7 @@ def test_schema_setter_non_list(self): table.schema = object() def test_schema_setter_invalid_field(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField client = _Client(self.PROJECT) dataset = _Dataset(client) table = self._makeOne(self.TABLE_NAME, dataset) @@ -230,7 +230,7 @@ def test_schema_setter_invalid_field(self): table.schema = [full_name, object()] def test_schema_setter(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField client = _Client(self.PROJECT) dataset = _Dataset(client) table = self._makeOne(self.TABLE_NAME, dataset) @@ -241,8 +241,8 @@ def test_schema_setter(self): def test_props_set_by_server(self): import datetime - from gcloud._helpers import UTC - from gcloud._helpers import _millis + from google.cloud._helpers import UTC + from google.cloud._helpers import _millis CREATED = datetime.datetime(2015, 7, 29, 12, 13, 22, tzinfo=UTC) MODIFIED = datetime.datetime(2015, 7, 29, 14, 47, 15, tzinfo=UTC) @@ -294,7 +294,7 @@ def test_expires_setter_bad_value(self): def test_expires_setter(self): import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC WHEN = datetime.datetime(2015, 7, 28, 16, 39, tzinfo=UTC) client = _Client(self.PROJECT) @@ -400,7 +400,7 @@ def test_create_no_view_query_no_schema(self): table.create() def test_create_w_bound_client(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables' % (self.PROJECT, self.DS_NAME) RESOURCE = self._makeResource() conn = _Connection(RESOURCE) @@ -430,7 +430,7 @@ def test_create_w_bound_client(self): self._verifyResourceProperties(table, RESOURCE) def test_create_w_partition_no_expire(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables' % (self.PROJECT, self.DS_NAME) RESOURCE = self._makeResource() conn = _Connection(RESOURCE) @@ -464,7 +464,7 @@ def test_create_w_partition_no_expire(self): self._verifyResourceProperties(table, RESOURCE) def test_create_w_partition_and_expire(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables' % (self.PROJECT, self.DS_NAME) RESOURCE = self._makeResource() conn = _Connection(RESOURCE) @@ -498,7 +498,7 @@ def test_create_w_partition_and_expire(self): self._verifyResourceProperties(table, RESOURCE) def test_partition_type_setter_bad_type(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField RESOURCE = self._makeResource() conn = _Connection(RESOURCE) client = _Client(project=self.PROJECT, connection=conn) @@ -511,7 +511,7 @@ def test_partition_type_setter_bad_type(self): table.partitioning_type = 123 def test_partition_type_setter_unknown_value(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField RESOURCE = self._makeResource() conn = _Connection(RESOURCE) client = _Client(project=self.PROJECT, connection=conn) @@ -524,7 +524,7 @@ def test_partition_type_setter_unknown_value(self): table.partitioning_type = "HASH" def test_partition_type_setter_w_known_value(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField RESOURCE = self._makeResource() conn = _Connection(RESOURCE) client = _Client(project=self.PROJECT, connection=conn) @@ -538,7 +538,7 @@ def test_partition_type_setter_w_known_value(self): self.assertEqual(table.partitioning_type, 'DAY') def test_partition_type_setter_w_none(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField RESOURCE = self._makeResource() conn = _Connection(RESOURCE) client = _Client(project=self.PROJECT, connection=conn) @@ -553,7 +553,7 @@ def test_partition_type_setter_w_none(self): self.assertFalse('timePartitioning' in table._properties) def test_partition_experation_bad_type(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField RESOURCE = self._makeResource() conn = _Connection(RESOURCE) client = _Client(project=self.PROJECT, connection=conn) @@ -566,7 +566,7 @@ def test_partition_experation_bad_type(self): table.partition_expiration = "NEVER" def test_partition_expiration_w_integer(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField RESOURCE = self._makeResource() conn = _Connection(RESOURCE) client = _Client(project=self.PROJECT, connection=conn) @@ -581,7 +581,7 @@ def test_partition_expiration_w_integer(self): self.assertEqual(table.partition_expiration, 100) def test_partition_expiration_w_none(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField RESOURCE = self._makeResource() conn = _Connection(RESOURCE) client = _Client(project=self.PROJECT, connection=conn) @@ -600,7 +600,7 @@ def test_partition_expiration_w_none(self): self.assertEqual(table.partition_expiration, None) def test_partition_expiration_w_none_no_partition_set(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField RESOURCE = self._makeResource() conn = _Connection(RESOURCE) client = _Client(project=self.PROJECT, connection=conn) @@ -615,7 +615,7 @@ def test_partition_expiration_w_none_no_partition_set(self): self.assertEqual(table.partition_expiration, None) def test_list_partitions(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField conn = _Connection() client = _Client(project=self.PROJECT, connection=conn) client._query_results = [(20160804, None), (20160805, None)] @@ -628,9 +628,9 @@ def test_list_partitions(self): def test_create_w_alternate_client(self): import datetime - from gcloud._helpers import UTC - from gcloud._helpers import _millis - from gcloud.bigquery.table import SchemaField + from google.cloud._helpers import UTC + from google.cloud._helpers import _millis + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables' % (self.PROJECT, self.DS_NAME) DESCRIPTION = 'DESCRIPTION' @@ -680,7 +680,7 @@ def test_create_w_alternate_client(self): def test_create_w_missing_output_properties(self): # In the wild, the resource returned from 'dataset.create' sometimes # lacks 'creationTime' / 'lastModifiedTime' - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables' % (self.PROJECT, self.DS_NAME) RESOURCE = self._makeResource() del RESOURCE['creationTime'] @@ -825,9 +825,9 @@ def test_patch_w_bound_client(self): def test_patch_w_alternate_client(self): import datetime - from gcloud._helpers import UTC - from gcloud._helpers import _millis - from gcloud.bigquery.table import SchemaField + from google.cloud._helpers import UTC + from google.cloud._helpers import _millis + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables/%s' % ( self.PROJECT, self.DS_NAME, self.TABLE_NAME) @@ -894,7 +894,7 @@ def test_patch_w_schema_None(self): self._verifyResourceProperties(table, RESOURCE) def test_update_w_bound_client(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables/%s' % ( self.PROJECT, self.DS_NAME, self.TABLE_NAME) DESCRIPTION = 'DESCRIPTION' @@ -934,8 +934,8 @@ def test_update_w_bound_client(self): def test_update_w_alternate_client(self): import datetime - from gcloud._helpers import UTC - from gcloud._helpers import _millis + from google.cloud._helpers import UTC + from google.cloud._helpers import _millis PATH = 'projects/%s/datasets/%s/tables/%s' % ( self.PROJECT, self.DS_NAME, self.TABLE_NAME) @@ -1015,8 +1015,8 @@ def test_delete_w_alternate_client(self): def test_fetch_data_w_bound_client(self): import datetime - from gcloud._helpers import UTC - from gcloud.bigquery.table import SchemaField + from google.cloud._helpers import UTC + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables/%s/data' % ( self.PROJECT, self.DS_NAME, self.TABLE_NAME) @@ -1084,7 +1084,7 @@ def _bigquery_timestamp_float_repr(ts_float): self.assertEqual(req['path'], '/%s' % PATH) def test_fetch_data_w_alternate_client(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables/%s/data' % ( self.PROJECT, self.DS_NAME, self.TABLE_NAME) MAX = 10 @@ -1150,7 +1150,7 @@ def test_fetch_data_w_alternate_client(self): {'maxResults': MAX, 'pageToken': TOKEN}) def test_fetch_data_w_repeated_fields(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables/%s/data' % ( self.PROJECT, self.DS_NAME, self.TABLE_NAME) ROWS = 1234 @@ -1192,7 +1192,7 @@ def test_fetch_data_w_repeated_fields(self): self.assertEqual(req['path'], '/%s' % PATH) def test_fetch_data_w_record_schema(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables/%s/data' % ( self.PROJECT, self.DS_NAME, self.TABLE_NAME) ROWS = 1234 @@ -1250,9 +1250,9 @@ def test_fetch_data_w_record_schema(self): def test_insert_data_w_bound_client(self): import datetime - from gcloud._helpers import UTC - from gcloud._helpers import _microseconds_from_datetime - from gcloud.bigquery.table import SchemaField + from google.cloud._helpers import UTC + from google.cloud._helpers import _microseconds_from_datetime + from google.cloud.bigquery.table import SchemaField WHEN_TS = 1437767599.006 WHEN = datetime.datetime.utcfromtimestamp(WHEN_TS).replace( @@ -1296,7 +1296,7 @@ def _row_data(row): self.assertEqual(req['data'], SENT) def test_insert_data_w_alternate_client(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables/%s/insertAll' % ( self.PROJECT, self.DS_NAME, self.TABLE_NAME) RESPONSE = { @@ -1360,7 +1360,7 @@ def _row_data(row): self.assertEqual(req['data'], SENT) def test_insert_data_w_repeated_fields(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables/%s/insertAll' % ( self.PROJECT, self.DS_NAME, self.TABLE_NAME) conn = _Connection({}) @@ -1395,7 +1395,7 @@ def _row_data(row): self.assertEqual(req['data'], SENT) def test_insert_data_w_record_schema(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField PATH = 'projects/%s/datasets/%s/tables/%s/insertAll' % ( self.PROJECT, self.DS_NAME, self.TABLE_NAME) conn = _Connection({}) @@ -1462,9 +1462,9 @@ def _upload_from_file_helper(self, **kw): import csv import datetime from six.moves.http_client import OK - from gcloud._helpers import UTC + from google.cloud._helpers import UTC from unit_tests._testing import _NamedTemporaryFile - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField WHEN_TS = 1437767599.006 WHEN = datetime.datetime.utcfromtimestamp(WHEN_TS).replace( @@ -1514,7 +1514,7 @@ 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 gcloud._helpers import _to_bytes + from google.cloud._helpers import _to_bytes requested, PATH, BODY = self._upload_from_file_helper() parse_chunk = _email_chunk_parser() @@ -1571,7 +1571,7 @@ def test_upload_from_file_w_explicit_client_resumable(self): from six.moves.urllib.parse import parse_qsl from six.moves.urllib.parse import urlsplit from unit_tests._testing import _Monkey - from gcloud.bigquery import table as MUT + from google.cloud.bigquery import table as MUT UPLOAD_PATH = 'https://example.com/upload/test' initial_response = {'status': OK, 'location': UPLOAD_PATH} @@ -1656,7 +1656,7 @@ class _UploadConfig(object): class Test_parse_schema_resource(unittest.TestCase, _SchemaBase): def _callFUT(self, resource): - from gcloud.bigquery.table import _parse_schema_resource + from google.cloud.bigquery.table import _parse_schema_resource return _parse_schema_resource(resource) def _makeResource(self): @@ -1700,11 +1700,11 @@ def test__parse_schema_resource_fields_without_mode(self): class Test_build_schema_resource(unittest.TestCase, _SchemaBase): def _callFUT(self, resource): - from gcloud.bigquery.table import _build_schema_resource + from google.cloud.bigquery.table import _build_schema_resource return _build_schema_resource(resource) def test_defaults(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField full_name = SchemaField('full_name', 'STRING', mode='REQUIRED') age = SchemaField('age', 'INTEGER', mode='REQUIRED') resource = self._callFUT([full_name, age]) @@ -1719,7 +1719,7 @@ def test_defaults(self): 'mode': 'REQUIRED'}) def test_w_description(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField DESCRIPTION = 'DESCRIPTION' full_name = SchemaField('full_name', 'STRING', mode='REQUIRED', description=DESCRIPTION) @@ -1737,7 +1737,7 @@ def test_w_description(self): 'mode': 'REQUIRED'}) def test_w_subfields(self): - from gcloud.bigquery.table import SchemaField + from google.cloud.bigquery.table import SchemaField full_name = SchemaField('full_name', 'STRING', mode='REQUIRED') ph_type = SchemaField('type', 'STRING', 'REQUIRED') ph_num = SchemaField('number', 'STRING', 'REQUIRED') @@ -1836,7 +1836,7 @@ def __init__(self, *responses): self.http = _HTTP(*responses) def api_request(self, **kw): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._requested.append(kw) try: diff --git a/unit_tests/bigtable/test_client.py b/unit_tests/bigtable/test_client.py index 5d406d412619..7f9833314b60 100644 --- a/unit_tests/bigtable/test_client.py +++ b/unit_tests/bigtable/test_client.py @@ -19,12 +19,12 @@ class Test__make_data_stub(unittest.TestCase): def _callFUT(self, client): - from gcloud.bigtable.client import _make_data_stub + from google.cloud.bigtable.client import _make_data_stub return _make_data_stub(client) def test_it(self): from unit_tests._testing import _Monkey - from gcloud.bigtable import client as MUT + from google.cloud.bigtable import client as MUT credentials = _Credentials() user_agent = 'you-sir-age-int' @@ -55,12 +55,12 @@ def mock_make_stub(*args): class Test__make_instance_stub(unittest.TestCase): def _callFUT(self, client): - from gcloud.bigtable.client import _make_instance_stub + from google.cloud.bigtable.client import _make_instance_stub return _make_instance_stub(client) def test_it(self): from unit_tests._testing import _Monkey - from gcloud.bigtable import client as MUT + from google.cloud.bigtable import client as MUT credentials = _Credentials() user_agent = 'you-sir-age-int' @@ -91,12 +91,12 @@ def mock_make_stub(*args): class Test__make_operations_stub(unittest.TestCase): def _callFUT(self, client): - from gcloud.bigtable.client import _make_operations_stub + from google.cloud.bigtable.client import _make_operations_stub return _make_operations_stub(client) def test_it(self): from unit_tests._testing import _Monkey - from gcloud.bigtable import client as MUT + from google.cloud.bigtable import client as MUT credentials = _Credentials() user_agent = 'you-sir-age-int' @@ -127,12 +127,12 @@ def mock_make_stub(*args): class Test__make_table_stub(unittest.TestCase): def _callFUT(self, client): - from gcloud.bigtable.client import _make_table_stub + from google.cloud.bigtable.client import _make_table_stub return _make_table_stub(client) def test_it(self): from unit_tests._testing import _Monkey - from gcloud.bigtable import client as MUT + from google.cloud.bigtable import client as MUT credentials = _Credentials() user_agent = 'you-sir-age-int' @@ -168,7 +168,7 @@ class TestClient(unittest.TestCase): USER_AGENT = 'you-sir-age-int' def _getTargetClass(self): - from gcloud.bigtable.client import Client + from google.cloud.bigtable.client import Client return Client def _makeOne(self, *args, **kwargs): @@ -176,7 +176,7 @@ def _makeOne(self, *args, **kwargs): def _makeOneWithMocks(self, *args, **kwargs): from unit_tests._testing import _Monkey - from gcloud.bigtable import client as MUT + from google.cloud.bigtable import client as MUT mock_make_data_stub = _MakeStubMock() mock_make_instance_stub = _MakeStubMock() @@ -192,7 +192,7 @@ def _constructor_test_helper(self, expected_scopes, creds, read_only=False, admin=False, user_agent=None, expected_creds=None): from unit_tests._testing import _Monkey - from gcloud.bigtable import client as MUT + from google.cloud.bigtable import client as MUT user_agent = user_agent or MUT.DEFAULT_USER_AGENT @@ -241,14 +241,14 @@ def _constructor_test_helper(self, expected_scopes, creds, self.assertIsNone(client._table_stub_internal) def test_constructor_default_scopes(self): - from gcloud.bigtable import client as MUT + from google.cloud.bigtable import client as MUT expected_scopes = [MUT.DATA_SCOPE] creds = _Credentials() self._constructor_test_helper(expected_scopes, creds) def test_constructor_custom_user_agent(self): - from gcloud.bigtable import client as MUT + from google.cloud.bigtable import client as MUT CUSTOM_USER_AGENT = 'custom-application' expected_scopes = [MUT.DATA_SCOPE] @@ -257,14 +257,14 @@ def test_constructor_custom_user_agent(self): user_agent=CUSTOM_USER_AGENT) def test_constructor_with_admin(self): - from gcloud.bigtable import client as MUT + from google.cloud.bigtable import client as MUT expected_scopes = [MUT.DATA_SCOPE, MUT.ADMIN_SCOPE] creds = _Credentials() self._constructor_test_helper(expected_scopes, creds, admin=True) def test_constructor_with_read_only(self): - from gcloud.bigtable import client as MUT + from google.cloud.bigtable import client as MUT expected_scopes = [MUT.READ_ONLY_SCOPE] creds = _Credentials() @@ -278,7 +278,7 @@ def test_constructor_both_admin_and_read_only(self): def test_constructor_implicit_credentials(self): from unit_tests._testing import _Monkey - from gcloud.bigtable import client as MUT + from google.cloud.bigtable import client as MUT creds = _Credentials() expected_scopes = [MUT.DATA_SCOPE] @@ -297,7 +297,7 @@ def test_constructor_credentials_wo_create_scoped(self): def _copy_test_helper(self, read_only=False, admin=False): from unit_tests._testing import _Monkey - from gcloud.bigtable import client as MUT + from google.cloud.bigtable import client as MUT credentials = _Credentials('value') client = self._makeOneWithMocks( @@ -407,9 +407,10 @@ def test_table_stub_non_admin_failure(self): getattr(client, '_table_stub') def test_instance_factory_defaults(self): - from gcloud.bigtable.cluster import DEFAULT_SERVE_NODES - from gcloud.bigtable.instance import Instance - from gcloud.bigtable.instance import _EXISTING_INSTANCE_LOCATION_ID + from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES + from google.cloud.bigtable.instance import Instance + from google.cloud.bigtable.instance import ( + _EXISTING_INSTANCE_LOCATION_ID) PROJECT = 'PROJECT' INSTANCE_ID = 'instance-id' @@ -429,7 +430,7 @@ def test_instance_factory_defaults(self): self.assertTrue(instance._client is client) def test_instance_factory_w_explicit_serve_nodes(self): - from gcloud.bigtable.instance import Instance + from google.cloud.bigtable.instance import Instance PROJECT = 'PROJECT' INSTANCE_ID = 'instance-id' @@ -452,9 +453,9 @@ def test_instance_factory_w_explicit_serve_nodes(self): self.assertTrue(instance._client is client) def test_list_instances(self): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( instance_pb2 as data_v2_pb2) - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb2) from unit_tests.bigtable._testing import _FakeStub diff --git a/unit_tests/bigtable/test_cluster.py b/unit_tests/bigtable/test_cluster.py index b253a7f7d461..5f19ed13b9af 100644 --- a/unit_tests/bigtable/test_cluster.py +++ b/unit_tests/bigtable/test_cluster.py @@ -26,14 +26,14 @@ class TestCluster(unittest.TestCase): '/clusters/' + CLUSTER_ID) def _getTargetClass(self): - from gcloud.bigtable.cluster import Cluster + from google.cloud.bigtable.cluster import Cluster return Cluster def _makeOne(self, *args, **kwargs): return self._getTargetClass()(*args, **kwargs) def test_constructor_defaults(self): - from gcloud.bigtable.cluster import DEFAULT_SERVE_NODES + from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES client = _Client(self.PROJECT) instance = _Instance(self.INSTANCE_ID, client) @@ -70,7 +70,7 @@ def test_copy(self): self.assertEqual(cluster, new_cluster) def test__update_from_pb_success(self): - from gcloud.bigtable.cluster import DEFAULT_SERVE_NODES + from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES SERVE_NODES = 8 cluster_pb = _ClusterPB( @@ -85,7 +85,7 @@ def test__update_from_pb_success(self): self.assertEqual(cluster.serve_nodes, SERVE_NODES) def test__update_from_pb_no_serve_nodes(self): - from gcloud.bigtable.cluster import DEFAULT_SERVE_NODES + from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES cluster_pb = _ClusterPB() client = _Client(self.PROJECT) @@ -188,7 +188,7 @@ def test___ne__(self): def test_reload(self): from unit_tests.bigtable._testing import _FakeStub - from gcloud.bigtable.cluster import DEFAULT_SERVE_NODES + from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES SERVE_NODES = 31 LOCATION = 'LOCATION' @@ -229,8 +229,8 @@ def test_reload(self): def test_create(self): from google.longrunning import operations_pb2 - from gcloud.operation import Operation - from gcloud.bigtable._generated import ( + from google.cloud.operation import Operation + from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb2) from unit_tests.bigtable._testing import _FakeStub @@ -274,15 +274,15 @@ def test_create(self): def test_update(self): import datetime from google.longrunning import operations_pb2 - from gcloud.operation import Operation + from google.cloud.operation import Operation from google.protobuf.any_pb2 import Any - from gcloud._helpers import _datetime_to_pb_timestamp - from gcloud.bigtable._generated import ( + from google.cloud._helpers import _datetime_to_pb_timestamp + from google.cloud.bigtable._generated import ( instance_pb2 as data_v2_pb2) - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb2) from unit_tests.bigtable._testing import _FakeStub - from gcloud.bigtable.cluster import _UPDATE_CLUSTER_METADATA_URL + from google.cloud.bigtable.cluster import _UPDATE_CLUSTER_METADATA_URL NOW = datetime.datetime.utcnow() NOW_PB = _datetime_to_pb_timestamp(NOW) @@ -372,11 +372,11 @@ def test_delete(self): class Test__prepare_create_request(unittest.TestCase): def _callFUT(self, cluster): - from gcloud.bigtable.cluster import _prepare_create_request + from google.cloud.bigtable.cluster import _prepare_create_request return _prepare_create_request(cluster) def test_it(self): - from gcloud.bigtable.cluster import Cluster + from google.cloud.bigtable.cluster import Cluster PROJECT = 'PROJECT' INSTANCE_ID = 'instance-id' @@ -396,19 +396,19 @@ def test_it(self): def _ClusterPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( instance_pb2 as instance_v2_pb2) return instance_v2_pb2.Cluster(*args, **kw) def _DeleteClusterRequestPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb2) return messages_v2_pb2.DeleteClusterRequest(*args, **kw) def _GetClusterRequestPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb2) return messages_v2_pb2.GetClusterRequest(*args, **kw) diff --git a/unit_tests/bigtable/test_column_family.py b/unit_tests/bigtable/test_column_family.py index 371df1a6c1d8..59b77293f1d9 100644 --- a/unit_tests/bigtable/test_column_family.py +++ b/unit_tests/bigtable/test_column_family.py @@ -19,7 +19,8 @@ class Test__timedelta_to_duration_pb(unittest.TestCase): def _callFUT(self, *args, **kwargs): - from gcloud.bigtable.column_family import _timedelta_to_duration_pb + from google.cloud.bigtable.column_family import ( + _timedelta_to_duration_pb) return _timedelta_to_duration_pb(*args, **kwargs) def test_it(self): @@ -64,7 +65,8 @@ def test_with_negative_seconds(self): class Test__duration_pb_to_timedelta(unittest.TestCase): def _callFUT(self, *args, **kwargs): - from gcloud.bigtable.column_family import _duration_pb_to_timedelta + from google.cloud.bigtable.column_family import ( + _duration_pb_to_timedelta) return _duration_pb_to_timedelta(*args, **kwargs) def test_it(self): @@ -84,7 +86,7 @@ def test_it(self): class TestMaxVersionsGCRule(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.column_family import MaxVersionsGCRule + from google.cloud.bigtable.column_family import MaxVersionsGCRule return MaxVersionsGCRule def _makeOne(self, *args, **kwargs): @@ -117,7 +119,7 @@ def test_to_pb(self): class TestMaxAgeGCRule(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.column_family import MaxAgeGCRule + from google.cloud.bigtable.column_family import MaxAgeGCRule return MaxAgeGCRule def _makeOne(self, *args, **kwargs): @@ -156,7 +158,7 @@ def test_to_pb(self): class TestGCRuleUnion(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.column_family import GCRuleUnion + from google.cloud.bigtable.column_family import GCRuleUnion return GCRuleUnion def _makeOne(self, *args, **kwargs): @@ -189,8 +191,8 @@ def test___ne__same_value(self): def test_to_pb(self): import datetime from google.protobuf import duration_pb2 - from gcloud.bigtable.column_family import MaxAgeGCRule - from gcloud.bigtable.column_family import MaxVersionsGCRule + from google.cloud.bigtable.column_family import MaxAgeGCRule + from google.cloud.bigtable.column_family import MaxVersionsGCRule max_num_versions = 42 rule1 = MaxVersionsGCRule(max_num_versions) @@ -211,8 +213,8 @@ def test_to_pb(self): def test_to_pb_nested(self): import datetime from google.protobuf import duration_pb2 - from gcloud.bigtable.column_family import MaxAgeGCRule - from gcloud.bigtable.column_family import MaxVersionsGCRule + from google.cloud.bigtable.column_family import MaxAgeGCRule + from google.cloud.bigtable.column_family import MaxVersionsGCRule max_num_versions1 = 42 rule1 = MaxVersionsGCRule(max_num_versions1) @@ -242,7 +244,7 @@ def test_to_pb_nested(self): class TestGCRuleIntersection(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.column_family import GCRuleIntersection + from google.cloud.bigtable.column_family import GCRuleIntersection return GCRuleIntersection def _makeOne(self, *args, **kwargs): @@ -275,8 +277,8 @@ def test___ne__same_value(self): def test_to_pb(self): import datetime from google.protobuf import duration_pb2 - from gcloud.bigtable.column_family import MaxAgeGCRule - from gcloud.bigtable.column_family import MaxVersionsGCRule + from google.cloud.bigtable.column_family import MaxAgeGCRule + from google.cloud.bigtable.column_family import MaxVersionsGCRule max_num_versions = 42 rule1 = MaxVersionsGCRule(max_num_versions) @@ -298,8 +300,8 @@ def test_to_pb(self): def test_to_pb_nested(self): import datetime from google.protobuf import duration_pb2 - from gcloud.bigtable.column_family import MaxAgeGCRule - from gcloud.bigtable.column_family import MaxVersionsGCRule + from google.cloud.bigtable.column_family import MaxAgeGCRule + from google.cloud.bigtable.column_family import MaxVersionsGCRule max_num_versions1 = 42 rule1 = MaxVersionsGCRule(max_num_versions1) @@ -331,7 +333,7 @@ def test_to_pb_nested(self): class TestColumnFamily(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.column_family import ColumnFamily + from google.cloud.bigtable.column_family import ColumnFamily return ColumnFamily def _makeOne(self, *args, **kwargs): @@ -395,7 +397,7 @@ def test_to_pb_no_rules(self): self.assertEqual(pb_val, expected) def test_to_pb_with_rule(self): - from gcloud.bigtable.column_family import MaxVersionsGCRule + from google.cloud.bigtable.column_family import MaxVersionsGCRule gc_rule = MaxVersionsGCRule(1) column_family = self._makeOne('column_family_id', None, @@ -405,7 +407,7 @@ def test_to_pb_with_rule(self): self.assertEqual(pb_val, expected) def _create_test_helper(self, gc_rule=None): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_table_admin_pb2 as table_admin_v2_pb2) from unit_tests.bigtable._testing import _FakeStub @@ -458,13 +460,13 @@ def test_create(self): self._create_test_helper(gc_rule=None) def test_create_with_gc_rule(self): - from gcloud.bigtable.column_family import MaxVersionsGCRule + from google.cloud.bigtable.column_family import MaxVersionsGCRule gc_rule = MaxVersionsGCRule(1337) self._create_test_helper(gc_rule=gc_rule) def _update_test_helper(self, gc_rule=None): from unit_tests.bigtable._testing import _FakeStub - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_table_admin_pb2 as table_admin_v2_pb2) project_id = 'project-id' @@ -516,13 +518,13 @@ def test_update(self): self._update_test_helper(gc_rule=None) def test_update_with_gc_rule(self): - from gcloud.bigtable.column_family import MaxVersionsGCRule + from google.cloud.bigtable.column_family import MaxVersionsGCRule gc_rule = MaxVersionsGCRule(1337) self._update_test_helper(gc_rule=gc_rule) def test_delete(self): from google.protobuf import empty_pb2 - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_table_admin_pb2 as table_admin_v2_pb2) from unit_tests.bigtable._testing import _FakeStub @@ -569,7 +571,7 @@ def test_delete(self): class Test__gc_rule_from_pb(unittest.TestCase): def _callFUT(self, *args, **kwargs): - from gcloud.bigtable.column_family import _gc_rule_from_pb + from google.cloud.bigtable.column_family import _gc_rule_from_pb return _gc_rule_from_pb(*args, **kwargs) def test_empty(self): @@ -578,7 +580,7 @@ def test_empty(self): self.assertEqual(self._callFUT(gc_rule_pb), None) def test_max_num_versions(self): - from gcloud.bigtable.column_family import MaxVersionsGCRule + from google.cloud.bigtable.column_family import MaxVersionsGCRule orig_rule = MaxVersionsGCRule(1) gc_rule_pb = orig_rule.to_pb() @@ -588,7 +590,7 @@ def test_max_num_versions(self): def test_max_age(self): import datetime - from gcloud.bigtable.column_family import MaxAgeGCRule + from google.cloud.bigtable.column_family import MaxAgeGCRule orig_rule = MaxAgeGCRule(datetime.timedelta(seconds=1)) gc_rule_pb = orig_rule.to_pb() @@ -598,9 +600,9 @@ def test_max_age(self): def test_union(self): import datetime - from gcloud.bigtable.column_family import GCRuleUnion - from gcloud.bigtable.column_family import MaxAgeGCRule - from gcloud.bigtable.column_family import MaxVersionsGCRule + from google.cloud.bigtable.column_family import GCRuleUnion + from google.cloud.bigtable.column_family import MaxAgeGCRule + from google.cloud.bigtable.column_family import MaxVersionsGCRule rule1 = MaxVersionsGCRule(1) rule2 = MaxAgeGCRule(datetime.timedelta(seconds=1)) @@ -612,9 +614,9 @@ def test_union(self): def test_intersection(self): import datetime - from gcloud.bigtable.column_family import GCRuleIntersection - from gcloud.bigtable.column_family import MaxAgeGCRule - from gcloud.bigtable.column_family import MaxVersionsGCRule + from google.cloud.bigtable.column_family import GCRuleIntersection + from google.cloud.bigtable.column_family import MaxAgeGCRule + from google.cloud.bigtable.column_family import MaxVersionsGCRule rule1 = MaxVersionsGCRule(1) rule2 = MaxAgeGCRule(datetime.timedelta(seconds=1)) @@ -640,25 +642,25 @@ def WhichOneof(cls, name): def _GcRulePB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( table_pb2 as table_v2_pb2) return table_v2_pb2.GcRule(*args, **kw) def _GcRuleIntersectionPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( table_pb2 as table_v2_pb2) return table_v2_pb2.GcRule.Intersection(*args, **kw) def _GcRuleUnionPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( table_pb2 as table_v2_pb2) return table_v2_pb2.GcRule.Union(*args, **kw) def _ColumnFamilyPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( table_pb2 as table_v2_pb2) return table_v2_pb2.ColumnFamily(*args, **kw) diff --git a/unit_tests/bigtable/test_instance.py b/unit_tests/bigtable/test_instance.py index 54d1ff12d381..e2f92c5e58d9 100644 --- a/unit_tests/bigtable/test_instance.py +++ b/unit_tests/bigtable/test_instance.py @@ -31,14 +31,14 @@ class TestInstance(unittest.TestCase): TABLE_NAME = INSTANCE_NAME + '/tables/' + TABLE_ID def _getTargetClass(self): - from gcloud.bigtable.instance import Instance + from google.cloud.bigtable.instance import Instance return Instance def _makeOne(self, *args, **kwargs): return self._getTargetClass()(*args, **kwargs) def test_constructor_defaults(self): - from gcloud.bigtable.cluster import DEFAULT_SERVE_NODES + from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES client = object() instance = self._makeOne(self.INSTANCE_ID, client, self.LOCATION_ID) @@ -74,7 +74,7 @@ def test_copy(self): self.assertEqual(instance, new_instance) def test_table_factory(self): - from gcloud.bigtable.table import Table + from google.cloud.bigtable.table import Table instance = self._makeOne(self.INSTANCE_ID, None, self.LOCATION_ID) @@ -84,7 +84,7 @@ def test_table_factory(self): self.assertEqual(table._instance, instance) def test__update_from_pb_success(self): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( instance_pb2 as data_v2_pb2) display_name = 'display_name' @@ -98,7 +98,7 @@ def test__update_from_pb_success(self): self.assertEqual(instance.display_name, display_name) def test__update_from_pb_no_display_name(self): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( instance_pb2 as data_v2_pb2) instance_pb = data_v2_pb2.Instance() @@ -109,8 +109,9 @@ def test__update_from_pb_no_display_name(self): self.assertEqual(instance.display_name, None) def test_from_pb_success(self): - from gcloud.bigtable.instance import _EXISTING_INSTANCE_LOCATION_ID - from gcloud.bigtable._generated import ( + from google.cloud.bigtable.instance import ( + _EXISTING_INSTANCE_LOCATION_ID) + from google.cloud.bigtable._generated import ( instance_pb2 as data_v2_pb2) client = _Client(project=self.PROJECT) @@ -129,7 +130,7 @@ def test_from_pb_success(self): _EXISTING_INSTANCE_LOCATION_ID) def test_from_pb_bad_instance_name(self): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( instance_pb2 as data_v2_pb2) instance_name = 'INCORRECT_FORMAT' @@ -140,7 +141,7 @@ def test_from_pb_bad_instance_name(self): klass.from_pb(instance_pb, None) def test_from_pb_project_mistmatch(self): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( instance_pb2 as data_v2_pb2) ALT_PROJECT = 'ALT_PROJECT' @@ -185,9 +186,9 @@ def test___ne__(self): self.assertNotEqual(instance1, instance2) def test_reload(self): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( instance_pb2 as data_v2_pb2) - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb) from unit_tests.bigtable._testing import _FakeStub @@ -229,13 +230,14 @@ def test_create(self): import datetime from google.longrunning import operations_pb2 from google.protobuf.any_pb2 import Any - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb2) - from gcloud._helpers import _datetime_to_pb_timestamp + from google.cloud._helpers import _datetime_to_pb_timestamp from unit_tests.bigtable._testing import _FakeStub - from gcloud.operation import Operation - from gcloud.bigtable.cluster import DEFAULT_SERVE_NODES - from gcloud.bigtable.instance import _CREATE_INSTANCE_METADATA_URL + from google.cloud.operation import Operation + from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES + from google.cloud.bigtable.instance import ( + _CREATE_INSTANCE_METADATA_URL) NOW = datetime.datetime.utcnow() NOW_PB = _datetime_to_pb_timestamp(NOW) @@ -283,10 +285,10 @@ def test_create(self): def test_create_w_explicit_serve_nodes(self): from google.longrunning import operations_pb2 - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb2) from unit_tests.bigtable._testing import _FakeStub - from gcloud.operation import Operation + from google.cloud.operation import Operation SERVE_NODES = 5 @@ -322,7 +324,7 @@ def test_create_w_explicit_serve_nodes(self): self.assertEqual(kwargs, {}) def test_update(self): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( instance_pb2 as data_v2_pb2) from unit_tests.bigtable._testing import _FakeStub @@ -357,7 +359,7 @@ def test_update(self): def test_delete(self): from google.protobuf import empty_pb2 - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb) from unit_tests.bigtable._testing import _FakeStub @@ -388,9 +390,9 @@ def test_delete(self): )]) def test_list_clusters(self): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( instance_pb2 as instance_v2_pb2) - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb2) from unit_tests.bigtable._testing import _FakeStub @@ -445,9 +447,9 @@ def test_list_clusters(self): )]) def _list_tables_helper(self, table_name=None): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( table_pb2 as table_data_v2_pb2) - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_table_admin_pb2 as table_messages_v1_pb2) from unit_tests.bigtable._testing import _FakeStub @@ -511,16 +513,16 @@ class Test__prepare_create_request(unittest.TestCase): CLUSTER_NAME = INSTANCE_NAME + '/clusters/' + INSTANCE_ID def _callFUT(self, instance, **kw): - from gcloud.bigtable.instance import _prepare_create_request + from google.cloud.bigtable.instance import _prepare_create_request return _prepare_create_request(instance, **kw) def test_w_defaults(self): - from gcloud.bigtable.cluster import DEFAULT_SERVE_NODES - from gcloud.bigtable._generated import ( + from google.cloud.bigtable.cluster import DEFAULT_SERVE_NODES + from google.cloud.bigtable._generated import ( instance_pb2 as data_v2_pb2) - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb) - from gcloud.bigtable.instance import Instance + from google.cloud.bigtable.instance import Instance client = _Client(self.PROJECT) @@ -542,11 +544,11 @@ def test_w_defaults(self): self.assertEqual(cluster.serve_nodes, DEFAULT_SERVE_NODES) def test_w_explicit_serve_nodes(self): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( instance_pb2 as data_v2_pb2) - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_instance_admin_pb2 as messages_v2_pb) - from gcloud.bigtable.instance import Instance + from google.cloud.bigtable.instance import Instance DISPLAY_NAME = u'DISPLAY_NAME' SERVE_NODES = 5 client = _Client(self.PROJECT) diff --git a/unit_tests/bigtable/test_row.py b/unit_tests/bigtable/test_row.py index f5d33023da32..f1e846ca172f 100644 --- a/unit_tests/bigtable/test_row.py +++ b/unit_tests/bigtable/test_row.py @@ -19,7 +19,7 @@ class Test_SetDeleteRow(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row import _SetDeleteRow + from google.cloud.bigtable.row import _SetDeleteRow return _SetDeleteRow def _makeOne(self, *args, **kwargs): @@ -34,7 +34,7 @@ def test__get_mutations_virtual(self): class TestDirectRow(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row import DirectRow + from google.cloud.bigtable.row import DirectRow return DirectRow def _makeOne(self, *args, **kwargs): @@ -123,7 +123,7 @@ def test_set_cell_with_non_bytes_value(self): def test_set_cell_with_non_null_timestamp(self): import datetime - from gcloud._helpers import _EPOCH + from google.cloud._helpers import _EPOCH microseconds = 898294371 millis_granularity = microseconds - (microseconds % 1000) @@ -243,8 +243,8 @@ def test_delete_cells_no_time_range(self): def test_delete_cells_with_time_range(self): import datetime - from gcloud._helpers import _EPOCH - from gcloud.bigtable.row_filters import TimestampRange + from google.cloud._helpers import _EPOCH + from google.cloud.bigtable.row_filters import TimestampRange microseconds = 30871000 # Makes sure already milliseconds granularity start = _EPOCH + datetime.timedelta(microseconds=microseconds) @@ -344,7 +344,7 @@ def test_commit(self): def test_commit_too_many_mutations(self): from unit_tests._testing import _Monkey - from gcloud.bigtable import row as MUT + from google.cloud.bigtable import row as MUT row_key = b'row_key' table = object() @@ -377,7 +377,7 @@ def test_commit_no_mutations(self): class TestConditionalRow(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row import ConditionalRow + from google.cloud.bigtable.row import ConditionalRow return ConditionalRow def _makeOne(self, *args, **kwargs): @@ -408,7 +408,7 @@ def test__get_mutations(self): def test_commit(self): from unit_tests.bigtable._testing import _FakeStub - from gcloud.bigtable.row_filters import RowSampleFilter + from google.cloud.bigtable.row_filters import RowSampleFilter row_key = b'row_key' table_name = 'projects/more-stuff' @@ -482,7 +482,7 @@ def test_commit(self): def test_commit_too_many_mutations(self): from unit_tests._testing import _Monkey - from gcloud.bigtable import row as MUT + from google.cloud.bigtable import row as MUT row_key = b'row_key' table = object() @@ -518,7 +518,7 @@ def test_commit_no_mutations(self): class TestAppendRow(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row import AppendRow + from google.cloud.bigtable.row import AppendRow return AppendRow def _makeOne(self, *args, **kwargs): @@ -574,7 +574,7 @@ def test_increment_cell_value(self): def test_commit(self): from unit_tests._testing import _Monkey from unit_tests.bigtable._testing import _FakeStub - from gcloud.bigtable import row as MUT + from google.cloud.bigtable import row as MUT row_key = b'row_key' table_name = 'projects/more-stuff' @@ -647,7 +647,7 @@ def test_commit_no_rules(self): def test_commit_too_many_mutations(self): from unit_tests._testing import _Monkey - from gcloud.bigtable import row as MUT + from google.cloud.bigtable import row as MUT row_key = b'row_key' table = object() @@ -662,11 +662,11 @@ def test_commit_too_many_mutations(self): class Test__parse_rmw_row_response(unittest.TestCase): def _callFUT(self, row_response): - from gcloud.bigtable.row import _parse_rmw_row_response + from google.cloud.bigtable.row import _parse_rmw_row_response return _parse_rmw_row_response(row_response) def test_it(self): - from gcloud._helpers import _datetime_from_microseconds + from google.cloud._helpers import _datetime_from_microseconds col_fam1 = u'col-fam-id' col_fam2 = u'col-fam-id2' col_name1 = b'col-name1' @@ -747,11 +747,11 @@ def test_it(self): class Test__parse_family_pb(unittest.TestCase): def _callFUT(self, family_pb): - from gcloud.bigtable.row import _parse_family_pb + from google.cloud.bigtable.row import _parse_family_pb return _parse_family_pb(family_pb) def test_it(self): - from gcloud._helpers import _datetime_from_microseconds + from google.cloud._helpers import _datetime_from_microseconds col_fam1 = u'col-fam-id' col_name1 = b'col-name1' col_name2 = b'col-name2' @@ -802,91 +802,91 @@ def test_it(self): def _CheckAndMutateRowRequestPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_pb2 as messages_v2_pb2) return messages_v2_pb2.CheckAndMutateRowRequest(*args, **kw) def _CheckAndMutateRowResponsePB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_pb2 as messages_v2_pb2) return messages_v2_pb2.CheckAndMutateRowResponse(*args, **kw) def _MutateRowRequestPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_pb2 as messages_v2_pb2) return messages_v2_pb2.MutateRowRequest(*args, **kw) def _ReadModifyWriteRowRequestPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_pb2 as messages_v2_pb2) return messages_v2_pb2.ReadModifyWriteRowRequest(*args, **kw) def _ReadModifyWriteRowResponsePB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_pb2 as messages_v2_pb2) return messages_v2_pb2.ReadModifyWriteRowResponse(*args, **kw) def _CellPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.Cell(*args, **kw) def _ColumnPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.Column(*args, **kw) def _FamilyPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.Family(*args, **kw) def _MutationPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.Mutation(*args, **kw) def _MutationSetCellPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.Mutation.SetCell(*args, **kw) def _MutationDeleteFromColumnPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.Mutation.DeleteFromColumn(*args, **kw) def _MutationDeleteFromFamilyPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.Mutation.DeleteFromFamily(*args, **kw) def _MutationDeleteFromRowPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.Mutation.DeleteFromRow(*args, **kw) def _RowPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.Row(*args, **kw) def _ReadModifyWriteRulePB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.ReadModifyWriteRule(*args, **kw) diff --git a/unit_tests/bigtable/test_row_data.py b/unit_tests/bigtable/test_row_data.py index ecff8dc2bd9d..25546511d4af 100644 --- a/unit_tests/bigtable/test_row_data.py +++ b/unit_tests/bigtable/test_row_data.py @@ -19,7 +19,7 @@ class TestCell(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_data import Cell + from google.cloud.bigtable.row_data import Cell return Cell def _makeOne(self, *args, **kwargs): @@ -27,8 +27,8 @@ def _makeOne(self, *args, **kwargs): def _from_pb_test_helper(self, labels=None): import datetime - from gcloud._helpers import _EPOCH - from gcloud.bigtable._generated import ( + from google.cloud._helpers import _EPOCH + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) timestamp_micros = 18738724000 # Make sure millis granularity @@ -94,7 +94,7 @@ def test___ne__(self): class TestPartialRowData(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_data import PartialRowData + from google.cloud.bigtable.row_data import PartialRowData return PartialRowData def _makeOne(self, *args, **kwargs): @@ -185,7 +185,7 @@ def test_row_key_getter(self): class TestPartialRowsData(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_data import PartialRowsData + from google.cloud.bigtable.row_data import PartialRowsData return PartialRowsData def _getDoNothingClass(self): @@ -383,7 +383,7 @@ def test__save_row_no_cell(self): self.assertTrue(prd._rows[ROW_KEY] is row) def test_invalid_last_scanned_row_key_on_start(self): - from gcloud.bigtable.row_data import InvalidReadRowsResponse + from google.cloud.bigtable.row_data import InvalidReadRowsResponse response = _ReadRowsResponseV2(chunks=(), last_scanned_row_key='ABC') iterator = _MockCancellableIterator(response) prd = self._makeOne(iterator) @@ -400,7 +400,7 @@ def test_valid_last_scanned_row_key_on_start(self): self.assertEqual(prd._last_scanned_row_key, 'AFTER') def test_invalid_empty_chunk(self): - from gcloud.bigtable.row_data import InvalidChunk + from google.cloud.bigtable.row_data import InvalidChunk chunks = _generate_cell_chunks(['']) response = _ReadRowsResponseV2(chunks) iterator = _MockCancellableIterator(response) @@ -409,7 +409,7 @@ def test_invalid_empty_chunk(self): prd.consume_next() def test_invalid_empty_second_chunk(self): - from gcloud.bigtable.row_data import InvalidChunk + from google.cloud.bigtable.row_data import InvalidChunk chunks = _generate_cell_chunks(['', '']) first = chunks[0] first.row_key = b'RK' @@ -427,7 +427,7 @@ class TestPartialRowsData_JSON_acceptance_tests(unittest.TestCase): _json_tests = None def _getTargetClass(self): - from gcloud.bigtable.row_data import PartialRowsData + from google.cloud.bigtable.row_data import PartialRowsData return PartialRowsData def _makeOne(self, *args, **kwargs): @@ -447,7 +447,7 @@ def _load_json_test(self, test_name): # JSON Error cases: invalid chunks def _fail_during_consume(self, testcase_name): - from gcloud.bigtable.row_data import InvalidChunk + from google.cloud.bigtable.row_data import InvalidChunk chunks, results = self._load_json_test(testcase_name) response = _ReadRowsResponseV2(chunks) iterator = _MockCancellableIterator(response) @@ -637,8 +637,8 @@ def test_empty_cell_chunk(self): def _flatten_cells(prd): # Match results format from JSON testcases. # Doesn't handle error cases. - from gcloud._helpers import _bytes_to_unicode - from gcloud._helpers import _microseconds_from_datetime + from google.cloud._helpers import _bytes_to_unicode + from google.cloud._helpers import _microseconds_from_datetime for row_key, row in prd.rows.items(): for family_name, family in row.cells.items(): for qualifier, column in family.items(): @@ -698,7 +698,7 @@ def __init__(self, chunks, last_scanned_row_key=''): def _generate_cell_chunks(chunk_text_pbs): from google.protobuf.text_format import Merge - from gcloud.bigtable._generated.bigtable_pb2 import ReadRowsResponse + from google.cloud.bigtable._generated.bigtable_pb2 import ReadRowsResponse chunks = [] diff --git a/unit_tests/bigtable/test_row_filters.py b/unit_tests/bigtable/test_row_filters.py index 3bbad5e7e2ae..7ef28c070580 100644 --- a/unit_tests/bigtable/test_row_filters.py +++ b/unit_tests/bigtable/test_row_filters.py @@ -19,7 +19,7 @@ class Test_BoolFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import _BoolFilter + from google.cloud.bigtable.row_filters import _BoolFilter return _BoolFilter def _makeOne(self, *args, **kwargs): @@ -53,7 +53,7 @@ def test___ne__same_value(self): class TestSinkFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import SinkFilter + from google.cloud.bigtable.row_filters import SinkFilter return SinkFilter def _makeOne(self, *args, **kwargs): @@ -70,7 +70,7 @@ def test_to_pb(self): class TestPassAllFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import PassAllFilter + from google.cloud.bigtable.row_filters import PassAllFilter return PassAllFilter def _makeOne(self, *args, **kwargs): @@ -87,7 +87,7 @@ def test_to_pb(self): class TestBlockAllFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import BlockAllFilter + from google.cloud.bigtable.row_filters import BlockAllFilter return BlockAllFilter def _makeOne(self, *args, **kwargs): @@ -104,7 +104,7 @@ def test_to_pb(self): class Test_RegexFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import _RegexFilter + from google.cloud.bigtable.row_filters import _RegexFilter return _RegexFilter def _makeOne(self, *args, **kwargs): @@ -143,7 +143,7 @@ def test___ne__same_value(self): class TestRowKeyRegexFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import RowKeyRegexFilter + from google.cloud.bigtable.row_filters import RowKeyRegexFilter return RowKeyRegexFilter def _makeOne(self, *args, **kwargs): @@ -160,7 +160,7 @@ def test_to_pb(self): class TestRowSampleFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import RowSampleFilter + from google.cloud.bigtable.row_filters import RowSampleFilter return RowSampleFilter def _makeOne(self, *args, **kwargs): @@ -194,7 +194,7 @@ def test_to_pb(self): class TestFamilyNameRegexFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import FamilyNameRegexFilter + from google.cloud.bigtable.row_filters import FamilyNameRegexFilter return FamilyNameRegexFilter def _makeOne(self, *args, **kwargs): @@ -211,7 +211,8 @@ def test_to_pb(self): class TestColumnQualifierRegexFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import ColumnQualifierRegexFilter + from google.cloud.bigtable.row_filters import ( + ColumnQualifierRegexFilter) return ColumnQualifierRegexFilter def _makeOne(self, *args, **kwargs): @@ -229,7 +230,7 @@ def test_to_pb(self): class TestTimestampRange(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import TimestampRange + from google.cloud.bigtable.row_filters import TimestampRange return TimestampRange def _makeOne(self, *args, **kwargs): @@ -266,7 +267,7 @@ def test___ne__same_value(self): def _to_pb_helper(self, start_micros=None, end_micros=None): import datetime - from gcloud._helpers import _EPOCH + from google.cloud._helpers import _EPOCH pb_kwargs = {} start = None @@ -303,7 +304,7 @@ def test_to_pb_end_only(self): class TestTimestampRangeFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import TimestampRangeFilter + from google.cloud.bigtable.row_filters import TimestampRangeFilter return TimestampRangeFilter def _makeOne(self, *args, **kwargs): @@ -327,7 +328,7 @@ def test___eq__same_value(self): self.assertEqual(row_filter1, row_filter2) def test_to_pb(self): - from gcloud.bigtable.row_filters import TimestampRange + from google.cloud.bigtable.row_filters import TimestampRange range_ = TimestampRange() row_filter = self._makeOne(range_) @@ -340,7 +341,7 @@ def test_to_pb(self): class TestColumnRangeFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import ColumnRangeFilter + from google.cloud.bigtable.row_filters import ColumnRangeFilter return ColumnRangeFilter def _makeOne(self, *args, **kwargs): @@ -464,7 +465,7 @@ def test_to_pb_exclusive_end(self): class TestValueRegexFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import ValueRegexFilter + from google.cloud.bigtable.row_filters import ValueRegexFilter return ValueRegexFilter def _makeOne(self, *args, **kwargs): @@ -481,7 +482,7 @@ def test_to_pb(self): class TestValueRangeFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import ValueRangeFilter + from google.cloud.bigtable.row_filters import ValueRangeFilter return ValueRangeFilter def _makeOne(self, *args, **kwargs): @@ -572,7 +573,7 @@ def test_to_pb_exclusive_end(self): class Test_CellCountFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import _CellCountFilter + from google.cloud.bigtable.row_filters import _CellCountFilter return _CellCountFilter def _makeOne(self, *args, **kwargs): @@ -606,7 +607,7 @@ def test___ne__same_value(self): class TestCellsRowOffsetFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import CellsRowOffsetFilter + from google.cloud.bigtable.row_filters import CellsRowOffsetFilter return CellsRowOffsetFilter def _makeOne(self, *args, **kwargs): @@ -624,7 +625,7 @@ def test_to_pb(self): class TestCellsRowLimitFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import CellsRowLimitFilter + from google.cloud.bigtable.row_filters import CellsRowLimitFilter return CellsRowLimitFilter def _makeOne(self, *args, **kwargs): @@ -642,7 +643,7 @@ def test_to_pb(self): class TestCellsColumnLimitFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import CellsColumnLimitFilter + from google.cloud.bigtable.row_filters import CellsColumnLimitFilter return CellsColumnLimitFilter def _makeOne(self, *args, **kwargs): @@ -660,7 +661,8 @@ def test_to_pb(self): class TestStripValueTransformerFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import StripValueTransformerFilter + from google.cloud.bigtable.row_filters import ( + StripValueTransformerFilter) return StripValueTransformerFilter def _makeOne(self, *args, **kwargs): @@ -677,7 +679,7 @@ def test_to_pb(self): class TestApplyLabelFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import ApplyLabelFilter + from google.cloud.bigtable.row_filters import ApplyLabelFilter return ApplyLabelFilter def _makeOne(self, *args, **kwargs): @@ -711,7 +713,7 @@ def test_to_pb(self): class Test_FilterCombination(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import _FilterCombination + from google.cloud.bigtable.row_filters import _FilterCombination return _FilterCombination def _makeOne(self, *args, **kwargs): @@ -742,15 +744,16 @@ def test___eq__type_differ(self): class TestRowFilterChain(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import RowFilterChain + from google.cloud.bigtable.row_filters import RowFilterChain return RowFilterChain def _makeOne(self, *args, **kwargs): return self._getTargetClass()(*args, **kwargs) def test_to_pb(self): - from gcloud.bigtable.row_filters import RowSampleFilter - from gcloud.bigtable.row_filters import StripValueTransformerFilter + from google.cloud.bigtable.row_filters import RowSampleFilter + from google.cloud.bigtable.row_filters import ( + StripValueTransformerFilter) row_filter1 = StripValueTransformerFilter(True) row_filter1_pb = row_filter1.to_pb() @@ -769,9 +772,10 @@ def test_to_pb(self): self.assertEqual(filter_pb, expected_pb) def test_to_pb_nested(self): - from gcloud.bigtable.row_filters import CellsRowLimitFilter - from gcloud.bigtable.row_filters import RowSampleFilter - from gcloud.bigtable.row_filters import StripValueTransformerFilter + from google.cloud.bigtable.row_filters import CellsRowLimitFilter + from google.cloud.bigtable.row_filters import RowSampleFilter + from google.cloud.bigtable.row_filters import ( + StripValueTransformerFilter) row_filter1 = StripValueTransformerFilter(True) row_filter2 = RowSampleFilter(0.25) @@ -796,15 +800,16 @@ def test_to_pb_nested(self): class TestRowFilterUnion(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import RowFilterUnion + from google.cloud.bigtable.row_filters import RowFilterUnion return RowFilterUnion def _makeOne(self, *args, **kwargs): return self._getTargetClass()(*args, **kwargs) def test_to_pb(self): - from gcloud.bigtable.row_filters import RowSampleFilter - from gcloud.bigtable.row_filters import StripValueTransformerFilter + from google.cloud.bigtable.row_filters import RowSampleFilter + from google.cloud.bigtable.row_filters import ( + StripValueTransformerFilter) row_filter1 = StripValueTransformerFilter(True) row_filter1_pb = row_filter1.to_pb() @@ -823,9 +828,10 @@ def test_to_pb(self): self.assertEqual(filter_pb, expected_pb) def test_to_pb_nested(self): - from gcloud.bigtable.row_filters import CellsRowLimitFilter - from gcloud.bigtable.row_filters import RowSampleFilter - from gcloud.bigtable.row_filters import StripValueTransformerFilter + from google.cloud.bigtable.row_filters import CellsRowLimitFilter + from google.cloud.bigtable.row_filters import RowSampleFilter + from google.cloud.bigtable.row_filters import ( + StripValueTransformerFilter) row_filter1 = StripValueTransformerFilter(True) row_filter2 = RowSampleFilter(0.25) @@ -850,7 +856,7 @@ def test_to_pb_nested(self): class TestConditionalRowFilter(unittest.TestCase): def _getTargetClass(self): - from gcloud.bigtable.row_filters import ConditionalRowFilter + from google.cloud.bigtable.row_filters import ConditionalRowFilter return ConditionalRowFilter def _makeOne(self, *args, **kwargs): @@ -890,9 +896,10 @@ def test___eq__type_differ(self): self.assertNotEqual(cond_filter1, cond_filter2) def test_to_pb(self): - from gcloud.bigtable.row_filters import CellsRowOffsetFilter - from gcloud.bigtable.row_filters import RowSampleFilter - from gcloud.bigtable.row_filters import StripValueTransformerFilter + from google.cloud.bigtable.row_filters import CellsRowOffsetFilter + from google.cloud.bigtable.row_filters import RowSampleFilter + from google.cloud.bigtable.row_filters import ( + StripValueTransformerFilter) row_filter1 = StripValueTransformerFilter(True) row_filter1_pb = row_filter1.to_pb() @@ -917,8 +924,9 @@ def test_to_pb(self): self.assertEqual(filter_pb, expected_pb) def test_to_pb_true_only(self): - from gcloud.bigtable.row_filters import RowSampleFilter - from gcloud.bigtable.row_filters import StripValueTransformerFilter + from google.cloud.bigtable.row_filters import RowSampleFilter + from google.cloud.bigtable.row_filters import ( + StripValueTransformerFilter) row_filter1 = StripValueTransformerFilter(True) row_filter1_pb = row_filter1.to_pb() @@ -938,8 +946,9 @@ def test_to_pb_true_only(self): self.assertEqual(filter_pb, expected_pb) def test_to_pb_false_only(self): - from gcloud.bigtable.row_filters import RowSampleFilter - from gcloud.bigtable.row_filters import StripValueTransformerFilter + from google.cloud.bigtable.row_filters import RowSampleFilter + from google.cloud.bigtable.row_filters import ( + StripValueTransformerFilter) row_filter1 = StripValueTransformerFilter(True) row_filter1_pb = row_filter1.to_pb() @@ -960,42 +969,42 @@ def test_to_pb_false_only(self): def _ColumnRangePB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.ColumnRange(*args, **kw) def _RowFilterPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.RowFilter(*args, **kw) def _RowFilterChainPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.RowFilter.Chain(*args, **kw) def _RowFilterConditionPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.RowFilter.Condition(*args, **kw) def _RowFilterInterleavePB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.RowFilter.Interleave(*args, **kw) def _TimestampRangePB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.TimestampRange(*args, **kw) def _ValueRangePB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( data_pb2 as data_v2_pb2) return data_v2_pb2.ValueRange(*args, **kw) diff --git a/unit_tests/bigtable/test_table.py b/unit_tests/bigtable/test_table.py index dd78fb722d47..924bb5041200 100644 --- a/unit_tests/bigtable/test_table.py +++ b/unit_tests/bigtable/test_table.py @@ -30,7 +30,7 @@ class TestTable(unittest.TestCase): VALUE = b'value' def _getTargetClass(self): - from gcloud.bigtable.table import Table + from google.cloud.bigtable.table import Table return Table def _makeOne(self, *args, **kwargs): @@ -54,7 +54,7 @@ def test_name_property(self): self.assertEqual(table.name, expected_name) def test_column_family_factory(self): - from gcloud.bigtable.column_family import ColumnFamily + from google.cloud.bigtable.column_family import ColumnFamily table_id = 'table-id' gc_rule = object() @@ -68,7 +68,7 @@ def test_column_family_factory(self): self.assertEqual(column_family._table, table) def test_row_factory_direct(self): - from gcloud.bigtable.row import DirectRow + from google.cloud.bigtable.row import DirectRow table_id = 'table-id' table = self._makeOne(table_id, None) @@ -80,7 +80,7 @@ def test_row_factory_direct(self): self.assertEqual(row._table, table) def test_row_factory_conditional(self): - from gcloud.bigtable.row import ConditionalRow + from google.cloud.bigtable.row import ConditionalRow table_id = 'table-id' table = self._makeOne(table_id, None) @@ -93,7 +93,7 @@ def test_row_factory_conditional(self): self.assertEqual(row._table, table) def test_row_factory_append(self): - from gcloud.bigtable.row import AppendRow + from google.cloud.bigtable.row import AppendRow table_id = 'table-id' table = self._makeOne(table_id, None) @@ -133,7 +133,7 @@ def test___ne__(self): self.assertNotEqual(table1, table2) def _create_test_helper(self, initial_split_keys, column_families=()): - from gcloud._helpers import _to_bytes + from google.cloud._helpers import _to_bytes from unit_tests.bigtable._testing import _FakeStub client = _Client() @@ -186,8 +186,8 @@ def test_create_with_split_keys(self): self._create_test_helper(initial_split_keys) def test_create_with_column_families(self): - from gcloud.bigtable.column_family import ColumnFamily - from gcloud.bigtable.column_family import MaxVersionsGCRule + from google.cloud.bigtable.column_family import ColumnFamily + from google.cloud.bigtable.column_family import MaxVersionsGCRule cf_id1 = 'col-fam-id1' cf1 = ColumnFamily(cf_id1, None) @@ -269,7 +269,7 @@ def test_delete(self): def _read_row_helper(self, chunks, expected_result): from unit_tests._testing import _Monkey from unit_tests.bigtable._testing import _FakeStub - from gcloud.bigtable import table as MUT + from google.cloud.bigtable import table as MUT client = _Client() instance = _Instance(self.INSTANCE_NAME, client=client) @@ -315,8 +315,8 @@ def test_read_row_miss_no_chunks_in_response(self): self._read_row_helper(chunks, None) def test_read_row_complete(self): - from gcloud.bigtable.row_data import Cell - from gcloud.bigtable.row_data import PartialRowData + from google.cloud.bigtable.row_data import Cell + from google.cloud.bigtable.row_data import PartialRowData chunk = _ReadRowsResponseCellChunkPB( row_key=self.ROW_KEY, @@ -349,8 +349,8 @@ def test_read_row_still_partial(self): def test_read_rows(self): from unit_tests._testing import _Monkey from unit_tests.bigtable._testing import _FakeStub - from gcloud.bigtable.row_data import PartialRowsData - from gcloud.bigtable import table as MUT + from google.cloud.bigtable.row_data import PartialRowsData + from google.cloud.bigtable import table as MUT client = _Client() instance = _Instance(self.INSTANCE_NAME, client=client) @@ -430,7 +430,7 @@ class Test__create_row_request(unittest.TestCase): def _callFUT(self, table_name, row_key=None, start_key=None, end_key=None, filter_=None, limit=None): - from gcloud.bigtable.table import _create_row_request + 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) @@ -484,7 +484,7 @@ def test_row_range_both_keys(self): self.assertEqual(result, expected_result) def test_with_filter(self): - from gcloud.bigtable.row_filters import RowSampleFilter + from google.cloud.bigtable.row_filters import RowSampleFilter table_name = 'table_name' row_filter = RowSampleFilter(0.33) result = self._callFUT(table_name, filter_=row_filter) @@ -506,37 +506,37 @@ def test_with_limit(self): def _CreateTableRequestPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_table_admin_pb2 as table_admin_v2_pb2) return table_admin_v2_pb2.CreateTableRequest(*args, **kw) def _CreateTableRequestSplitPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_table_admin_pb2 as table_admin_v2_pb2) return table_admin_v2_pb2.CreateTableRequest.Split(*args, **kw) def _DeleteTableRequestPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_table_admin_pb2 as table_admin_v2_pb2) return table_admin_v2_pb2.DeleteTableRequest(*args, **kw) def _GetTableRequestPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_table_admin_pb2 as table_admin_v2_pb2) return table_admin_v2_pb2.GetTableRequest(*args, **kw) def _ReadRowsRequestPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_pb2 as messages_v2_pb2) return messages_v2_pb2.ReadRowsRequest(*args, **kw) def _ReadRowsResponseCellChunkPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_pb2 as messages_v2_pb2) family_name = kw.pop('family_name') qualifier = kw.pop('qualifier') @@ -547,25 +547,25 @@ def _ReadRowsResponseCellChunkPB(*args, **kw): def _ReadRowsResponsePB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_pb2 as messages_v2_pb2) return messages_v2_pb2.ReadRowsResponse(*args, **kw) def _SampleRowKeysRequestPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( bigtable_pb2 as messages_v2_pb2) return messages_v2_pb2.SampleRowKeysRequest(*args, **kw) def _TablePB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( table_pb2 as table_v2_pb2) return table_v2_pb2.Table(*args, **kw) def _ColumnFamilyPB(*args, **kw): - from gcloud.bigtable._generated import ( + from google.cloud.bigtable._generated import ( table_pb2 as table_v2_pb2) return table_v2_pb2.ColumnFamily(*args, **kw) diff --git a/unit_tests/datastore/test_batch.py b/unit_tests/datastore/test_batch.py index 26832bab6922..e3c85d88cbf9 100644 --- a/unit_tests/datastore/test_batch.py +++ b/unit_tests/datastore/test_batch.py @@ -18,7 +18,7 @@ class TestBatch(unittest.TestCase): def _getTargetClass(self): - from gcloud.datastore.batch import Batch + from google.cloud.datastore.batch import Batch return Batch @@ -26,7 +26,7 @@ def _makeOne(self, client): return self._getTargetClass()(client) def test_ctor(self): - from gcloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import datastore_pb2 _PROJECT = 'PROJECT' _NAMESPACE = 'NAMESPACE' connection = _Connection() @@ -97,7 +97,7 @@ def test_put_entity_w_partial_key(self): self.assertEqual(batch._partial_key_entities, [entity]) def test_put_entity_w_completed_key(self): - from gcloud.datastore.helpers import _property_tuples + from google.cloud.datastore.helpers import _property_tuples _PROJECT = 'PROJECT' _PROPERTIES = { @@ -344,7 +344,7 @@ def is_partial(self): return self._id is None def to_protobuf(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 key = self._key = entity_pb2.Key() # Don't assign it, because it will just get ripped out # key.partition_id.project_id = self.project diff --git a/unit_tests/datastore/test_client.py b/unit_tests/datastore/test_client.py index a3a7110dddab..999a7d95dac4 100644 --- a/unit_tests/datastore/test_client.py +++ b/unit_tests/datastore/test_client.py @@ -16,8 +16,8 @@ def _make_entity_pb(project, kind, integer_id, name=None, str_val=None): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.helpers import _new_value_pb entity_pb = entity_pb2.Entity() entity_pb.key.partition_id.project_id = project @@ -34,7 +34,7 @@ def _make_entity_pb(project, kind, integer_id, name=None, str_val=None): class Test__get_gcd_project(unittest.TestCase): def _callFUT(self): - from gcloud.datastore.client import _get_gcd_project + from google.cloud.datastore.client import _get_gcd_project return _get_gcd_project() def test_no_value(self): @@ -49,7 +49,7 @@ def test_no_value(self): def test_value_set(self): import os from unit_tests._testing import _Monkey - from gcloud.datastore.client import GCD_DATASET + from google.cloud.datastore.client import GCD_DATASET MOCK_PROJECT = object() environ = {GCD_DATASET: MOCK_PROJECT} @@ -61,14 +61,14 @@ def test_value_set(self): class Test__determine_default_project(unittest.TestCase): def _callFUT(self, project=None): - from gcloud.datastore.client import ( + from google.cloud.datastore.client import ( _determine_default_project) return _determine_default_project(project=project) def _determine_default_helper(self, gcd=None, fallback=None, project_called=None): from unit_tests._testing import _Monkey - from gcloud.datastore import client + from google.cloud.datastore import client _callers = [] @@ -129,7 +129,7 @@ def tearDown(self): KLASS._connection_class = self.original_cnxn_class def _getTargetClass(self): - from gcloud.datastore.client import Client + from google.cloud.datastore.client import Client return Client def _makeOne(self, project=PROJECT, namespace=None, @@ -141,7 +141,7 @@ def _makeOne(self, project=PROJECT, namespace=None, def test_ctor_w_project_no_environ(self): from unit_tests._testing import _Monkey - from gcloud.datastore import client as _MUT + from google.cloud.datastore import client as _MUT # Some environments (e.g. AppVeyor CI) run in GCE, so # this test would fail artificially. @@ -150,8 +150,8 @@ def test_ctor_w_project_no_environ(self): def test_ctor_w_implicit_inputs(self): from unit_tests._testing import _Monkey - from gcloud.datastore import client as _MUT - from gcloud import client as _base_client + from google.cloud.datastore import client as _MUT + from google.cloud import client as _base_client OTHER = 'other' creds = object() @@ -263,7 +263,7 @@ def test_get_multi_no_keys(self): self.assertEqual(results, []) def test_get_multi_miss(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key creds = object() client = self._makeOne(credentials=creds) @@ -273,8 +273,8 @@ def test_get_multi_miss(self): self.assertEqual(results, []) def test_get_multi_miss_w_missing(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.key import Key + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.key import Key KIND = 'Kind' ID = 1234 @@ -299,7 +299,7 @@ def test_get_multi_miss_w_missing(self): [key.to_protobuf()]) def test_get_multi_w_missing_non_empty(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key creds = object() client = self._makeOne(credentials=creds) @@ -310,7 +310,7 @@ def test_get_multi_w_missing_non_empty(self): [key], missing=missing) def test_get_multi_w_deferred_non_empty(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key creds = object() client = self._makeOne(credentials=creds) @@ -321,7 +321,7 @@ def test_get_multi_w_deferred_non_empty(self): [key], deferred=deferred) def test_get_multi_miss_w_deferred(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key key = Key('Kind', 1234, project=self.PROJECT) @@ -337,9 +337,9 @@ def test_get_multi_miss_w_deferred(self): [key.to_protobuf()]) def test_get_multi_w_deferred_from_backend_but_not_passed(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.entity import Entity - from gcloud.datastore.key import Key + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.entity import Entity + from google.cloud.datastore.key import Key key1 = Key('Kind', project=self.PROJECT) key1_pb = key1.to_protobuf() @@ -390,7 +390,7 @@ def test_get_multi_w_deferred_from_backend_but_not_passed(self): self.assertTrue(tid is None) def test_get_multi_hit(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key KIND = 'Kind' ID = 1234 @@ -416,7 +416,7 @@ def test_get_multi_hit(self): self.assertEqual(result['foo'], 'Foo') def test_get_multi_hit_w_transaction(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key TXN_ID = '123' KIND = 'Kind' @@ -450,7 +450,7 @@ def test_get_multi_hit_w_transaction(self): self.assertEqual(transaction_id, TXN_ID) def test_get_multi_hit_multiple_keys_same_project(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key KIND = 'Kind' ID1 = 1234 @@ -476,7 +476,7 @@ def test_get_multi_hit_multiple_keys_same_project(self): self.assertEqual(dict(retrieved2), {}) def test_get_multi_hit_multiple_keys_different_project(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key PROJECT1 = 'PROJECT' PROJECT2 = 'PROJECT-ALT' @@ -495,8 +495,8 @@ def test_get_multi_hit_multiple_keys_different_project(self): def test_get_multi_max_loops(self): from unit_tests._testing import _Monkey - from gcloud.datastore import client as _MUT - from gcloud.datastore.key import Key + from google.cloud.datastore import client as _MUT + from google.cloud.datastore.key import Key KIND = 'Kind' ID = 1234 @@ -544,15 +544,15 @@ def test_put_multi_no_entities(self): self.assertEqual(client.put_multi([]), None) def test_put_multi_w_single_empty_entity(self): - # https://github.com/GoogleCloudPlatform/gcloud-python/issues/649 - from gcloud.datastore.entity import Entity + # https://github.com/GoogleCloudPlatform/google-cloud-python/issues/649 + from google.cloud.datastore.entity import Entity creds = object() client = self._makeOne(credentials=creds) self.assertRaises(ValueError, client.put_multi, Entity()) def test_put_multi_no_batch_w_partial_key(self): - from gcloud.datastore.helpers import _property_tuples + from google.cloud.datastore.helpers import _property_tuples entity = _Entity(foo=u'bar') key = entity.key = _Key(self.PROJECT) @@ -582,7 +582,7 @@ def test_put_multi_no_batch_w_partial_key(self): self.assertTrue(transaction_id is None) def test_put_multi_existing_batch_w_completed_key(self): - from gcloud.datastore.helpers import _property_tuples + from google.cloud.datastore.helpers import _property_tuples creds = object() client = self._makeOne(credentials=creds) @@ -701,7 +701,7 @@ def test_key_w_project(self): client.key, KIND, ID, project=self.PROJECT) def test_key_wo_project(self): - from gcloud.datastore import client as MUT + from google.cloud.datastore import client as MUT from unit_tests._testing import _Monkey KIND = 'KIND' @@ -722,7 +722,7 @@ def test_key_wo_project(self): self.assertEqual(key.kwargs, expected_kwargs) def test_key_w_namespace(self): - from gcloud.datastore import client as MUT + from google.cloud.datastore import client as MUT from unit_tests._testing import _Monkey KIND = 'KIND' @@ -743,7 +743,7 @@ def test_key_w_namespace(self): self.assertEqual(key.kwargs, expected_kwargs) def test_key_w_namespace_collision(self): - from gcloud.datastore import client as MUT + from google.cloud.datastore import client as MUT from unit_tests._testing import _Monkey KIND = 'KIND' @@ -765,7 +765,7 @@ def test_key_w_namespace_collision(self): self.assertEqual(key.kwargs, expected_kwargs) def test_batch(self): - from gcloud.datastore import client as MUT + from google.cloud.datastore import client as MUT from unit_tests._testing import _Monkey creds = object() @@ -779,7 +779,7 @@ def test_batch(self): self.assertEqual(batch.kwargs, {}) def test_transaction_defaults(self): - from gcloud.datastore import client as MUT + from google.cloud.datastore import client as MUT from unit_tests._testing import _Monkey creds = object() @@ -811,7 +811,7 @@ def test_query_w_project(self): client.query, kind=KIND, project=self.PROJECT) def test_query_w_defaults(self): - from gcloud.datastore import client as MUT + from google.cloud.datastore import client as MUT from unit_tests._testing import _Monkey creds = object() @@ -829,7 +829,7 @@ def test_query_w_defaults(self): self.assertEqual(query.kwargs, expected_kwargs) def test_query_explicit(self): - from gcloud.datastore import client as MUT + from google.cloud.datastore import client as MUT from unit_tests._testing import _Monkey KIND = 'KIND' @@ -869,7 +869,7 @@ def test_query_explicit(self): self.assertEqual(query.kwargs, kwargs) def test_query_w_namespace(self): - from gcloud.datastore import client as MUT + from google.cloud.datastore import client as MUT from unit_tests._testing import _Monkey KIND = 'KIND' @@ -891,7 +891,7 @@ def test_query_w_namespace(self): self.assertEqual(query.kwargs, expected_kwargs) def test_query_w_namespace_collision(self): - from gcloud.datastore import client as MUT + from google.cloud.datastore import client as MUT from unit_tests._testing import _Monkey KIND = 'KIND' @@ -957,7 +957,7 @@ def allocate_ids(self, project, key_pbs): class _NoCommitBatch(object): def __init__(self, client): - from gcloud.datastore.batch import Batch + from google.cloud.datastore.batch import Batch self._client = client self._batch = Batch(client) @@ -972,7 +972,7 @@ def __exit__(self, *args): class _NoCommitTransaction(object): def __init__(self, client, transaction_id='TRANSACTION'): - from gcloud.datastore.transaction import Transaction + from google.cloud.datastore.transaction import Transaction self._client = client xact = self._transaction = Transaction(client) xact._id = transaction_id @@ -1007,7 +1007,7 @@ def is_partial(self): return self._id is None def to_protobuf(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 key = self._key = entity_pb2.Key() # Don't assign it, because it will just get ripped out # key.partition_id.project_id = self.project diff --git a/unit_tests/datastore/test_connection.py b/unit_tests/datastore/test_connection.py index 1067a9357b71..478fd522a5cf 100644 --- a/unit_tests/datastore/test_connection.py +++ b/unit_tests/datastore/test_connection.py @@ -14,13 +14,13 @@ import unittest -from gcloud.datastore.connection import _HAVE_GRPC +from google.cloud.datastore.connection import _HAVE_GRPC class Test_DatastoreAPIOverHttp(unittest.TestCase): def _getTargetClass(self): - from gcloud.datastore.connection import _DatastoreAPIOverHttp + from google.cloud.datastore.connection import _DatastoreAPIOverHttp return _DatastoreAPIOverHttp def _makeOne(self, *args, **kw): @@ -84,7 +84,7 @@ def test__request_w_200(self): [{'method': METHOD, 'project': PROJECT}]) def test__request_not_200(self): - from gcloud.exceptions import BadRequest + from google.cloud.exceptions import BadRequest from google.rpc import status_pb2 error = status_pb2.Status() @@ -109,12 +109,12 @@ def test__request_not_200(self): class Test_DatastoreAPIOverGRPC(unittest.TestCase): def _getTargetClass(self): - from gcloud.datastore.connection import _DatastoreAPIOverGRPC + from google.cloud.datastore.connection import _DatastoreAPIOverGRPC return _DatastoreAPIOverGRPC def _makeOne(self, stub, connection=None, mock_args=None): from unit_tests._testing import _Monkey - from gcloud.datastore import connection as MUT + from google.cloud.datastore import connection as MUT if connection is None: connection = _Connection(None) @@ -131,7 +131,7 @@ def mock_make_stub(*args): return self._getTargetClass()(connection) def test_constructor(self): - from gcloud.datastore import connection as MUT + from google.cloud.datastore import connection as MUT conn = _Connection(None) conn.credentials = object() @@ -221,7 +221,7 @@ def test_commit_failure_aborted(self): from grpc import StatusCode from grpc._channel import _Rendezvous from grpc._channel import _RPCState - from gcloud.exceptions import Conflict + from google.cloud.exceptions import Conflict details = 'Bad things.' exc_state = _RPCState((), None, None, StatusCode.ABORTED, details) @@ -274,19 +274,19 @@ def test_allocate_ids(self): class TestConnection(unittest.TestCase): def _getTargetClass(self): - from gcloud.datastore.connection import Connection + from google.cloud.datastore.connection import Connection return Connection def _make_key_pb(self, project, id_=1234): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key path_args = ('Kind',) if id_ is not None: path_args += (id_,) return Key(*path_args, project=project).to_protobuf() def _make_query_pb(self, kind): - from gcloud.datastore._generated import query_pb2 + from google.cloud.datastore._generated import query_pb2 pb = query_pb2.Query() pb.kind.add().name = kind return pb @@ -294,7 +294,7 @@ def _make_query_pb(self, kind): def _makeOne(self, credentials=None, http=None, api_base_url=None, have_grpc=False): from unit_tests._testing import _Monkey - from gcloud.datastore import connection as MUT + from google.cloud.datastore import connection as MUT with _Monkey(MUT, _HAVE_GRPC=have_grpc): return self._getTargetClass()(credentials=credentials, http=http, api_base_url=api_base_url) @@ -315,8 +315,8 @@ def test_default_url(self): def test_custom_url_from_env(self): import os from unit_tests._testing import _Monkey - from gcloud.connection import API_BASE_URL - from gcloud.environment_vars import GCD_HOST + from google.cloud.connection import API_BASE_URL + from google.cloud.environment_vars import GCD_HOST HOST = 'CURR_HOST' fake_environ = {GCD_HOST: HOST} @@ -328,7 +328,7 @@ def test_custom_url_from_env(self): self.assertEqual(conn.api_base_url, HOST + '/datastore') def test_custom_url_from_constructor(self): - from gcloud.connection import API_BASE_URL + from google.cloud.connection import API_BASE_URL HOST = object() conn = self._makeOne(api_base_url=HOST) @@ -338,8 +338,8 @@ def test_custom_url_from_constructor(self): def test_custom_url_constructor_and_env(self): import os from unit_tests._testing import _Monkey - from gcloud.connection import API_BASE_URL - from gcloud.environment_vars import GCD_HOST + from google.cloud.connection import API_BASE_URL + from google.cloud.environment_vars import GCD_HOST HOST1 = object() HOST2 = object() @@ -358,7 +358,7 @@ def test_ctor_defaults(self): def test_ctor_without_grpc(self): from unit_tests._testing import _Monkey - from gcloud.datastore import connection as MUT + from google.cloud.datastore import connection as MUT connections = [] return_val = object() @@ -376,7 +376,7 @@ def mock_api(connection): def test_ctor_with_grpc(self): from unit_tests._testing import _Monkey - from gcloud.datastore import connection as MUT + from google.cloud.datastore import connection as MUT connections = [] return_val = object() @@ -460,7 +460,7 @@ def test_build_api_url_w_explicit_base_version(self): URI) def test_lookup_single_key_empty_response(self): - from gcloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import datastore_pb2 PROJECT = 'PROJECT' key_pb = self._make_key_pb(PROJECT) @@ -487,7 +487,7 @@ def test_lookup_single_key_empty_response(self): self.assertEqual(key_pb, keys[0]) def test_lookup_single_key_empty_response_w_eventual(self): - from gcloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import datastore_pb2 PROJECT = 'PROJECT' key_pb = self._make_key_pb(PROJECT) @@ -526,7 +526,7 @@ def test_lookup_single_key_empty_response_w_eventual_and_transaction(self): eventual=True, transaction_id=TRANSACTION) def test_lookup_single_key_empty_response_w_transaction(self): - from gcloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import datastore_pb2 PROJECT = 'PROJECT' TRANSACTION = b'TRANSACTION' @@ -556,8 +556,8 @@ def test_lookup_single_key_empty_response_w_transaction(self): self.assertEqual(request.read_options.transaction, TRANSACTION) def test_lookup_single_key_nonempty_response(self): - from gcloud.datastore._generated import datastore_pb2 - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import entity_pb2 PROJECT = 'PROJECT' key_pb = self._make_key_pb(PROJECT) @@ -588,7 +588,7 @@ def test_lookup_single_key_nonempty_response(self): self.assertEqual(key_pb, keys[0]) def test_lookup_multiple_keys_empty_response(self): - from gcloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import datastore_pb2 PROJECT = 'PROJECT' key_pb1 = self._make_key_pb(PROJECT) @@ -617,7 +617,7 @@ def test_lookup_multiple_keys_empty_response(self): self.assertEqual(key_pb2, keys[1]) def test_lookup_multiple_keys_w_missing(self): - from gcloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import datastore_pb2 PROJECT = 'PROJECT' key_pb1 = self._make_key_pb(PROJECT) @@ -651,7 +651,7 @@ def test_lookup_multiple_keys_w_missing(self): self.assertEqual(key_pb2, keys[1]) def test_lookup_multiple_keys_w_deferred(self): - from gcloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import datastore_pb2 PROJECT = 'PROJECT' key_pb1 = self._make_key_pb(PROJECT) @@ -687,8 +687,8 @@ def test_lookup_multiple_keys_w_deferred(self): self.assertEqual(key_pb2, keys[1]) def test_run_query_w_eventual_no_transaction(self): - from gcloud.datastore._generated import datastore_pb2 - from gcloud.datastore._generated import query_pb2 + from google.cloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import query_pb2 PROJECT = 'PROJECT' KIND = 'Nonesuch' @@ -725,8 +725,8 @@ def test_run_query_w_eventual_no_transaction(self): self.assertEqual(request.read_options.transaction, b'') def test_run_query_wo_eventual_w_transaction(self): - from gcloud.datastore._generated import datastore_pb2 - from gcloud.datastore._generated import query_pb2 + from google.cloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import query_pb2 PROJECT = 'PROJECT' KIND = 'Nonesuch' @@ -765,8 +765,8 @@ def test_run_query_wo_eventual_w_transaction(self): self.assertEqual(request.read_options.transaction, TRANSACTION) def test_run_query_w_eventual_and_transaction(self): - from gcloud.datastore._generated import datastore_pb2 - from gcloud.datastore._generated import query_pb2 + from google.cloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import query_pb2 PROJECT = 'PROJECT' KIND = 'Nonesuch' @@ -783,8 +783,8 @@ def test_run_query_w_eventual_and_transaction(self): eventual=True, transaction_id=TRANSACTION) def test_run_query_wo_namespace_empty_result(self): - from gcloud.datastore._generated import datastore_pb2 - from gcloud.datastore._generated import query_pb2 + from google.cloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import query_pb2 PROJECT = 'PROJECT' KIND = 'Nonesuch' @@ -817,8 +817,8 @@ def test_run_query_wo_namespace_empty_result(self): self.assertEqual(request.query, q_pb) def test_run_query_w_namespace_nonempty_result(self): - from gcloud.datastore._generated import datastore_pb2 - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import entity_pb2 PROJECT = 'PROJECT' KIND = 'Kind' @@ -847,7 +847,7 @@ def test_run_query_w_namespace_nonempty_result(self): self.assertEqual(request.query, q_pb) def test_begin_transaction(self): - from gcloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import datastore_pb2 PROJECT = 'PROJECT' TRANSACTION = b'TRANSACTION' @@ -870,9 +870,9 @@ def test_begin_transaction(self): def test_commit_wo_transaction(self): from unit_tests._testing import _Monkey - from gcloud.datastore._generated import datastore_pb2 - from gcloud.datastore import connection as MUT - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore._generated import datastore_pb2 + from google.cloud.datastore import connection as MUT + from google.cloud.datastore.helpers import _new_value_pb PROJECT = 'PROJECT' key_pb = self._make_key_pb(PROJECT) @@ -916,9 +916,9 @@ def mock_parse(response): def test_commit_w_transaction(self): from unit_tests._testing import _Monkey - from gcloud.datastore._generated import datastore_pb2 - from gcloud.datastore import connection as MUT - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore._generated import datastore_pb2 + from google.cloud.datastore import connection as MUT + from google.cloud.datastore.helpers import _new_value_pb PROJECT = 'PROJECT' key_pb = self._make_key_pb(PROJECT) @@ -961,7 +961,7 @@ def mock_parse(response): self.assertEqual(_parsed, [rsp_pb]) def test_rollback_ok(self): - from gcloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import datastore_pb2 PROJECT = 'PROJECT' TRANSACTION = b'xact' @@ -983,7 +983,7 @@ def test_rollback_ok(self): self.assertEqual(request.transaction, TRANSACTION) def test_allocate_ids_empty(self): - from gcloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import datastore_pb2 PROJECT = 'PROJECT' rsp_pb = datastore_pb2.AllocateIdsResponse() @@ -1004,7 +1004,7 @@ def test_allocate_ids_empty(self): self.assertEqual(list(request.keys), []) def test_allocate_ids_non_empty(self): - from gcloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import datastore_pb2 PROJECT = 'PROJECT' before_key_pbs = [ @@ -1041,12 +1041,12 @@ def test_allocate_ids_non_empty(self): class Test__parse_commit_response(unittest.TestCase): def _callFUT(self, commit_response_pb): - from gcloud.datastore.connection import _parse_commit_response + from google.cloud.datastore.connection import _parse_commit_response return _parse_commit_response(commit_response_pb) def test_it(self): - from gcloud.datastore._generated import datastore_pb2 - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import entity_pb2 index_updates = 1337 keys = [ diff --git a/unit_tests/datastore/test_entity.py b/unit_tests/datastore/test_entity.py index b082923348b3..deff3a90d28f 100644 --- a/unit_tests/datastore/test_entity.py +++ b/unit_tests/datastore/test_entity.py @@ -22,7 +22,7 @@ class TestEntity(unittest.TestCase): def _getTargetClass(self): - from gcloud.datastore.entity import Entity + from google.cloud.datastore.entity import Entity return Entity def _makeOne(self, key=None, exclude_from_indexes=()): @@ -51,14 +51,14 @@ def test_ctor_bad_exclude_from_indexes(self): exclude_from_indexes=BAD_EXCLUDE_FROM_INDEXES) def test___eq_____ne___w_non_entity(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key key = Key(_KIND, _ID, project=_PROJECT) entity = self._makeOne(key=key) self.assertFalse(entity == object()) self.assertTrue(entity != object()) def test___eq_____ne___w_different_keys(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key _ID1 = 1234 _ID2 = 2345 key1 = Key(_KIND, _ID1, project=_PROJECT) @@ -69,7 +69,7 @@ def test___eq_____ne___w_different_keys(self): self.assertTrue(entity1 != entity2) def test___eq_____ne___w_same_keys(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key name = 'foo' value = 42 @@ -89,7 +89,7 @@ def test___eq_____ne___w_same_keys(self): self.assertFalse(entity1 != entity2) def test___eq_____ne___w_same_keys_different_props(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key key1 = Key(_KIND, _ID, project=_PROJECT) entity1 = self._makeOne(key=key1) entity1['foo'] = 'Foo' @@ -100,7 +100,7 @@ def test___eq_____ne___w_same_keys_different_props(self): self.assertTrue(entity1 != entity2) def test___eq_____ne___w_same_keys_props_w_equiv_keys_as_value(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key key1 = Key(_KIND, _ID, project=_PROJECT) key2 = Key(_KIND, _ID, project=_PROJECT) entity1 = self._makeOne(key=key1) @@ -111,7 +111,7 @@ def test___eq_____ne___w_same_keys_props_w_equiv_keys_as_value(self): self.assertFalse(entity1 != entity2) def test___eq_____ne___w_same_keys_props_w_diff_keys_as_value(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key _ID1 = 1234 _ID2 = 2345 key1 = Key(_KIND, _ID1, project=_PROJECT) @@ -124,7 +124,7 @@ def test___eq_____ne___w_same_keys_props_w_diff_keys_as_value(self): self.assertTrue(entity1 != entity2) def test___eq_____ne___w_same_keys_props_w_equiv_entities_as_value(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key key = Key(_KIND, _ID, project=_PROJECT) entity1 = self._makeOne(key=key) sub1 = self._makeOne() @@ -138,7 +138,7 @@ def test___eq_____ne___w_same_keys_props_w_equiv_entities_as_value(self): self.assertFalse(entity1 != entity2) def test___eq_____ne___w_same_keys_props_w_diff_entities_as_value(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key key = Key(_KIND, _ID, project=_PROJECT) entity1 = self._makeOne(key=key) sub1 = self._makeOne() @@ -152,7 +152,7 @@ def test___eq_____ne___w_same_keys_props_w_diff_entities_as_value(self): self.assertTrue(entity1 != entity2) def test__eq__same_value_different_exclude(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key name = 'foo' value = 42 @@ -167,7 +167,7 @@ def test__eq__same_value_different_exclude(self): self.assertFalse(entity1 == entity2) def test__eq__same_value_different_meanings(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key name = 'foo' value = 42 diff --git a/unit_tests/datastore/test_helpers.py b/unit_tests/datastore/test_helpers.py index c9b6b2bc6762..560a7a98af8f 100644 --- a/unit_tests/datastore/test_helpers.py +++ b/unit_tests/datastore/test_helpers.py @@ -18,11 +18,11 @@ class Test__new_value_pb(unittest.TestCase): def _callFUT(self, entity_pb, name): - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore.helpers import _new_value_pb return _new_value_pb(entity_pb, name) def test_it(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 entity_pb = entity_pb2.Entity() name = 'foo' @@ -36,13 +36,13 @@ def test_it(self): class Test__property_tuples(unittest.TestCase): def _callFUT(self, entity_pb): - from gcloud.datastore.helpers import _property_tuples + from google.cloud.datastore.helpers import _property_tuples return _property_tuples(entity_pb) def test_it(self): import types - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.helpers import _new_value_pb entity_pb = entity_pb2.Entity() name1 = 'foo' @@ -59,12 +59,12 @@ def test_it(self): class Test_entity_from_protobuf(unittest.TestCase): def _callFUT(self, val): - from gcloud.datastore.helpers import entity_from_protobuf + from google.cloud.datastore.helpers import entity_from_protobuf return entity_from_protobuf(val) def test_it(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.helpers import _new_value_pb _PROJECT = 'PROJECT' _KIND = 'KIND' @@ -109,8 +109,8 @@ def test_it(self): self.assertEqual(key.id, _ID) def test_mismatched_value_indexed(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.helpers import _new_value_pb _PROJECT = 'PROJECT' _KIND = 'KIND' @@ -133,7 +133,7 @@ def test_mismatched_value_indexed(self): self._callFUT(entity_pb) def test_entity_no_key(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 entity_pb = entity_pb2.Entity() entity = self._callFUT(entity_pb) @@ -142,8 +142,8 @@ def test_entity_no_key(self): self.assertEqual(dict(entity), {}) def test_entity_with_meaning(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.helpers import _new_value_pb entity_pb = entity_pb2.Entity() name = 'hello' @@ -157,8 +157,8 @@ def test_entity_with_meaning(self): self.assertEqual(entity._meanings, {name: (meaning, val)}) def test_nested_entity_no_key(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.helpers import _new_value_pb PROJECT = 'FOO' KIND = 'KIND' @@ -192,11 +192,11 @@ def test_nested_entity_no_key(self): class Test_entity_to_protobuf(unittest.TestCase): def _callFUT(self, entity): - from gcloud.datastore.helpers import entity_to_protobuf + from google.cloud.datastore.helpers import entity_to_protobuf return entity_to_protobuf(entity) def _compareEntityProto(self, entity_pb1, entity_pb2): - from gcloud.datastore.helpers import _property_tuples + from google.cloud.datastore.helpers import _property_tuples self.assertEqual(entity_pb1.key, entity_pb2.key) value_list1 = sorted(_property_tuples(entity_pb1)) @@ -214,17 +214,17 @@ def _compareEntityProto(self, entity_pb1, entity_pb2): self.assertEqual(val1, val2) def test_empty(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.entity import Entity + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.entity import Entity entity = Entity() entity_pb = self._callFUT(entity) self._compareEntityProto(entity_pb, entity_pb2.Entity()) def test_key_only(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.entity import Entity - from gcloud.datastore.key import Key + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.entity import Entity + from google.cloud.datastore.key import Key kind, name = 'PATH', 'NAME' project = 'PROJECT' @@ -241,9 +241,9 @@ def test_key_only(self): self._compareEntityProto(entity_pb, expected_pb) def test_simple_fields(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.entity import Entity - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.entity import Entity + from google.cloud.datastore.helpers import _new_value_pb entity = Entity() name1 = 'foo' @@ -261,8 +261,8 @@ def test_simple_fields(self): self._compareEntityProto(entity_pb, expected_pb) def test_with_empty_list(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.entity import Entity + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.entity import Entity entity = Entity() entity['foo'] = [] @@ -271,9 +271,9 @@ def test_with_empty_list(self): self._compareEntityProto(entity_pb, entity_pb2.Entity()) def test_inverts_to_protobuf(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.helpers import _new_value_pb - from gcloud.datastore.helpers import entity_from_protobuf + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.helpers import _new_value_pb + from google.cloud.datastore.helpers import entity_from_protobuf original_pb = entity_pb2.Entity() # Add a key. @@ -324,9 +324,9 @@ def test_inverts_to_protobuf(self): self._compareEntityProto(original_pb, new_pb) def test_meaning_with_change(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.entity import Entity - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.entity import Entity + from google.cloud.datastore.helpers import _new_value_pb entity = Entity() name = 'foo' @@ -342,9 +342,9 @@ def test_meaning_with_change(self): self._compareEntityProto(entity_pb, expected_pb) def test_variable_meanings(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.entity import Entity - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.entity import Entity + from google.cloud.datastore.helpers import _new_value_pb entity = Entity() name = 'quux' @@ -371,12 +371,12 @@ def test_variable_meanings(self): class Test_key_from_protobuf(unittest.TestCase): def _callFUT(self, val): - from gcloud.datastore.helpers import key_from_protobuf + from google.cloud.datastore.helpers import key_from_protobuf return key_from_protobuf(val) def _makePB(self, project=None, namespace=None, path=()): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 pb = entity_pb2.Key() if project is not None: pb.partition_id.project_id = project @@ -425,14 +425,14 @@ def test_w_nothing_in_pb(self): class Test__pb_attr_value(unittest.TestCase): def _callFUT(self, val): - from gcloud.datastore.helpers import _pb_attr_value + from google.cloud.datastore.helpers import _pb_attr_value return _pb_attr_value(val) def test_datetime_naive(self): import calendar import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC micros = 4375 naive = datetime.datetime(2014, 9, 16, 10, 19, 32, micros) # No zone. @@ -445,7 +445,7 @@ def test_datetime_naive(self): def test_datetime_w_zone(self): import calendar import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC micros = 4375 utc = datetime.datetime(2014, 9, 16, 10, 19, 32, micros, UTC) @@ -455,7 +455,7 @@ def test_datetime_w_zone(self): self.assertEqual(value.nanos, 1000 * micros) def test_key(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key key = Key('PATH', 1234, project='PROJECT') name, value = self._callFUT(key) @@ -503,7 +503,7 @@ def test_unicode(self): self.assertEqual(value, u'str') def test_entity(self): - from gcloud.datastore.entity import Entity + from google.cloud.datastore.entity import Entity entity = Entity() name, value = self._callFUT(entity) self.assertEqual(name, 'entity_value') @@ -517,7 +517,7 @@ def test_array(self): def test_geo_point(self): from google.type import latlng_pb2 - from gcloud.datastore.helpers import GeoPoint + from google.cloud.datastore.helpers import GeoPoint lat = 42.42 lng = 99.0007 @@ -541,12 +541,12 @@ def test_object(self): class Test__get_value_from_value_pb(unittest.TestCase): def _callFUT(self, pb): - from gcloud.datastore.helpers import _get_value_from_value_pb + from google.cloud.datastore.helpers import _get_value_from_value_pb return _get_value_from_value_pb(pb) def _makePB(self, attr_name, value): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 pb = entity_pb2.Value() setattr(pb, attr_name, value) @@ -555,8 +555,8 @@ def _makePB(self, attr_name, value): def test_datetime(self): import calendar import datetime - from gcloud._helpers import UTC - from gcloud.datastore._generated import entity_pb2 + from google.cloud._helpers import UTC + from google.cloud.datastore._generated import entity_pb2 micros = 4375 utc = datetime.datetime(2014, 9, 16, 10, 19, 32, micros, UTC) @@ -566,8 +566,8 @@ def test_datetime(self): self.assertEqual(self._callFUT(pb), utc) def test_key(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.key import Key + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.key import Key pb = entity_pb2.Value() expected = Key('KIND', 1234, project='PROJECT').to_protobuf() @@ -596,9 +596,9 @@ def test_unicode(self): self.assertEqual(self._callFUT(pb), u'str') def test_entity(self): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.entity import Entity - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.entity import Entity + from google.cloud.datastore.helpers import _new_value_pb pb = entity_pb2.Value() entity_pb = pb.entity_value @@ -612,7 +612,7 @@ def test_entity(self): self.assertEqual(entity['foo'], 'Foo') def test_array(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 pb = entity_pb2.Value() array_pb = pb.array_value.values @@ -625,8 +625,8 @@ def test_array(self): def test_geo_point(self): from google.type import latlng_pb2 - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore.helpers import GeoPoint + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore.helpers import GeoPoint lat = -3.14 lng = 13.37 @@ -639,14 +639,14 @@ def test_geo_point(self): def test_null(self): from google.protobuf import struct_pb2 - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 pb = entity_pb2.Value(null_value=struct_pb2.NULL_VALUE) result = self._callFUT(pb) self.assertIsNone(result) def test_unknown(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 pb = entity_pb2.Value() with self.assertRaises(ValueError): @@ -656,18 +656,18 @@ def test_unknown(self): class Test_set_protobuf_value(unittest.TestCase): def _callFUT(self, value_pb, val): - from gcloud.datastore.helpers import _set_protobuf_value + from google.cloud.datastore.helpers import _set_protobuf_value return _set_protobuf_value(value_pb, val) def _makePB(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 return entity_pb2.Value() def test_datetime(self): import calendar import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC pb = self._makePB() micros = 4375 @@ -678,7 +678,7 @@ def test_datetime(self): self.assertEqual(value.nanos, 1000 * micros) def test_key(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key pb = self._makePB() key = Key('KIND', 1234, project='PROJECT') @@ -739,8 +739,8 @@ def test_unicode(self): self.assertEqual(value, u'str') def test_entity_empty_wo_key(self): - from gcloud.datastore.entity import Entity - from gcloud.datastore.helpers import _property_tuples + from google.cloud.datastore.entity import Entity + from google.cloud.datastore.helpers import _property_tuples pb = self._makePB() entity = Entity() @@ -750,9 +750,9 @@ def test_entity_empty_wo_key(self): self.assertEqual(len(list(_property_tuples(value))), 0) def test_entity_w_key(self): - from gcloud.datastore.entity import Entity - from gcloud.datastore.helpers import _property_tuples - from gcloud.datastore.key import Key + from google.cloud.datastore.entity import Entity + from google.cloud.datastore.helpers import _property_tuples + from google.cloud.datastore.key import Key name = 'foo' value = u'Foo' @@ -781,7 +781,7 @@ def test_array(self): def test_geo_point(self): from google.type import latlng_pb2 - from gcloud.datastore.helpers import GeoPoint + from google.cloud.datastore.helpers import GeoPoint pb = self._makePB() lat = 9.11 @@ -795,18 +795,18 @@ def test_geo_point(self): class Test__get_meaning(unittest.TestCase): def _callFUT(self, *args, **kwargs): - from gcloud.datastore.helpers import _get_meaning + from google.cloud.datastore.helpers import _get_meaning return _get_meaning(*args, **kwargs) def test_no_meaning(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 value_pb = entity_pb2.Value() result = self._callFUT(value_pb) self.assertEqual(result, None) def test_single(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 value_pb = entity_pb2.Value() value_pb.meaning = meaning = 22 @@ -815,7 +815,7 @@ def test_single(self): self.assertEqual(meaning, result) def test_empty_array_value(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 value_pb = entity_pb2.Value() value_pb.array_value.values.add() @@ -825,7 +825,7 @@ def test_empty_array_value(self): self.assertEqual(None, result) def test_array_value(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 value_pb = entity_pb2.Value() meaning = 9 @@ -840,7 +840,7 @@ def test_array_value(self): self.assertEqual(meaning, result) def test_array_value_multiple_meanings(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 value_pb = entity_pb2.Value() meaning1 = 9 @@ -857,7 +857,7 @@ def test_array_value_multiple_meanings(self): self.assertEqual(result, [meaning1, meaning2]) def test_array_value_meaning_partially_unset(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 value_pb = entity_pb2.Value() meaning1 = 9 @@ -875,7 +875,7 @@ def test_array_value_meaning_partially_unset(self): class TestGeoPoint(unittest.TestCase): def _getTargetClass(self): - from gcloud.datastore.helpers import GeoPoint + from google.cloud.datastore.helpers import GeoPoint return GeoPoint def _makeOne(self, *args, **kwargs): diff --git a/unit_tests/datastore/test_key.py b/unit_tests/datastore/test_key.py index 2090b1ae0dc9..074323f43361 100644 --- a/unit_tests/datastore/test_key.py +++ b/unit_tests/datastore/test_key.py @@ -20,7 +20,7 @@ class TestKey(unittest.TestCase): _DEFAULT_PROJECT = 'PROJECT' def _getTargetClass(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key return Key def _makeOne(self, *args, **kwargs): @@ -313,7 +313,7 @@ def test_completed_key_on_complete(self): self.assertRaises(ValueError, key.completed_key, 5678) def test_to_protobuf_defaults(self): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 _KIND = 'KIND' key = self._makeOne(_KIND, project=self._DEFAULT_PROJECT) diff --git a/unit_tests/datastore/test_query.py b/unit_tests/datastore/test_query.py index 65860fd0a4a9..a9a027438d92 100644 --- a/unit_tests/datastore/test_query.py +++ b/unit_tests/datastore/test_query.py @@ -20,7 +20,7 @@ class TestQuery(unittest.TestCase): _PROJECT = 'PROJECT' def _getTargetClass(self): - from gcloud.datastore.query import Query + from google.cloud.datastore.query import Query return Query def _makeOne(self, *args, **kw): @@ -45,7 +45,7 @@ def test_ctor_defaults(self): self.assertEqual(query.distinct_on, []) def test_ctor_explicit(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key _PROJECT = 'OTHER_PROJECT' _KIND = 'KIND' _NAMESPACE = 'OTHER_NAMESPACE' @@ -143,7 +143,7 @@ def _assign(val): self.assertRaises(TypeError, _assign, ['KIND', 'NAME']) def test_ancestor_setter_w_key(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key _NAME = u'NAME' key = Key('KIND', 123, project=self._PROJECT) query = self._makeOne(self._makeClient()) @@ -152,7 +152,7 @@ def test_ancestor_setter_w_key(self): self.assertEqual(query.ancestor.path, key.path) def test_ancestor_deleter_w_key(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key key = Key('KIND', 123, project=self._PROJECT) query = self._makeOne(client=self._makeClient(), ancestor=key) del query.ancestor @@ -183,7 +183,7 @@ def test_add_filter_w_all_operators(self): self.assertEqual(query.filters[4], ('eq_prop', '=', u'val5')) def test_add_filter_w_known_operator_and_entity(self): - from gcloud.datastore.entity import Entity + from google.cloud.datastore.entity import Entity query = self._makeOne(self._makeClient()) other = Entity() other['firstname'] = u'John' @@ -198,14 +198,14 @@ def test_add_filter_w_whitespace_property_name(self): self.assertEqual(query.filters, [(PROPERTY_NAME, '=', u'John')]) def test_add_filter___key__valid_key(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key query = self._makeOne(self._makeClient()) key = Key('Foo', project=self._PROJECT) query.add_filter('__key__', '=', key) self.assertEqual(query.filters, [('__key__', '=', key)]) def test_filter___key__not_equal_operator(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key key = Key('Foo', project=self._PROJECT) query = self._makeOne(self._makeClient()) query.add_filter('__key__', '<', key) @@ -245,7 +245,7 @@ def test_keys_only(self): self.assertEqual(query.projection, ['__key__']) def test_key_filter_defaults(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key client = self._makeClient() query = self._makeOne(client) @@ -255,7 +255,7 @@ def test_key_filter_defaults(self): self.assertEqual(query.filters, [('__key__', '=', key)]) def test_key_filter_explicit(self): - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key client = self._makeClient() query = self._makeOne(client) @@ -339,7 +339,7 @@ class TestIterator(unittest.TestCase): _END = b'\xFF' def _getTargetClass(self): - from gcloud.datastore.query import Iterator + from google.cloud.datastore.query import Iterator return Iterator def _makeOne(self, *args, **kw): @@ -347,9 +347,9 @@ def _makeOne(self, *args, **kw): def _addQueryResults(self, connection, cursor=_END, more=False, skipped_results=None, no_entity=False): - from gcloud.datastore._generated import entity_pb2 - from gcloud.datastore._generated import query_pb2 - from gcloud.datastore.helpers import _new_value_pb + from google.cloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import query_pb2 + from google.cloud.datastore.helpers import _new_value_pb if more: more_enum = query_pb2.QueryResultBatch.NOT_FINISHED @@ -394,7 +394,7 @@ def test_ctor_explicit(self): self.assertEqual(iterator._offset, 29) def test_next_page_no_cursors_no_more(self): - from gcloud.datastore.query import _pb_from_query + from google.cloud.datastore.query import _pb_from_query connection = _Connection() client = self._makeClient(connection) query = _Query(client, self._KIND, self._PROJECT, self._NAMESPACE) @@ -421,7 +421,7 @@ def test_next_page_no_cursors_no_more(self): self.assertEqual(connection._called_with, [EXPECTED]) def test_next_page_no_cursors_no_more_w_offset_and_limit(self): - from gcloud.datastore.query import _pb_from_query + from google.cloud.datastore.query import _pb_from_query connection = _Connection() client = self._makeClient(connection) query = _Query(client, self._KIND, self._PROJECT, self._NAMESPACE) @@ -453,7 +453,7 @@ def test_next_page_no_cursors_no_more_w_offset_and_limit(self): def test_next_page_w_cursors_w_more(self): from base64 import urlsafe_b64decode from base64 import urlsafe_b64encode - from gcloud.datastore.query import _pb_from_query + from google.cloud.datastore.query import _pb_from_query connection = _Connection() client = self._makeClient(connection) query = _Query(client, self._KIND, self._PROJECT, self._NAMESPACE) @@ -496,7 +496,7 @@ def test_next_page_w_cursors_w_bogus_more(self): self.assertRaises(ValueError, iterator.next_page) def test___iter___no_more(self): - from gcloud.datastore.query import _pb_from_query + from google.cloud.datastore.query import _pb_from_query connection = _Connection() client = self._makeClient(connection) query = _Query(client, self._KIND, self._PROJECT, self._NAMESPACE) @@ -520,7 +520,7 @@ def test___iter___no_more(self): self.assertEqual(connection._called_with, [EXPECTED]) def test___iter___w_more(self): - from gcloud.datastore.query import _pb_from_query + from google.cloud.datastore.query import _pb_from_query connection = _Connection() client = self._makeClient(connection) query = _Query(client, self._KIND, self._PROJECT, self._NAMESPACE) @@ -556,7 +556,7 @@ def test___iter___w_more(self): self.assertEqual(connection._called_with[1], EXPECTED2) def test___iter___w_limit(self): - from gcloud.datastore.query import _pb_from_query + from google.cloud.datastore.query import _pb_from_query connection = _Connection() client = self._makeClient(connection) @@ -614,11 +614,11 @@ def test___iter___w_limit(self): class Test__pb_from_query(unittest.TestCase): def _callFUT(self, query): - from gcloud.datastore.query import _pb_from_query + from google.cloud.datastore.query import _pb_from_query return _pb_from_query(query) def test_empty(self): - from gcloud.datastore._generated import query_pb2 + from google.cloud.datastore._generated import query_pb2 pb = self._callFUT(_Query()) self.assertEqual(list(pb.projection), []) @@ -645,8 +645,8 @@ def test_kind(self): self.assertEqual([item.name for item in pb.kind], ['KIND']) def test_ancestor(self): - from gcloud.datastore.key import Key - from gcloud.datastore._generated import query_pb2 + from google.cloud.datastore.key import Key + from google.cloud.datastore._generated import query_pb2 ancestor = Key('Ancestor', 123, project='PROJECT') pb = self._callFUT(_Query(ancestor=ancestor)) @@ -659,7 +659,7 @@ def test_ancestor(self): self.assertEqual(pfilter.value.key_value, ancestor_pb) def test_filter(self): - from gcloud.datastore._generated import query_pb2 + from google.cloud.datastore._generated import query_pb2 query = _Query(filters=[('name', '=', u'John')]) query.OPERATORS = { @@ -674,8 +674,8 @@ def test_filter(self): self.assertEqual(pfilter.value.string_value, u'John') def test_filter_key(self): - from gcloud.datastore.key import Key - from gcloud.datastore._generated import query_pb2 + from google.cloud.datastore.key import Key + from google.cloud.datastore._generated import query_pb2 key = Key('Kind', 123, project='PROJECT') query = _Query(filters=[('__key__', '=', key)]) @@ -692,7 +692,7 @@ def test_filter_key(self): self.assertEqual(pfilter.value.key_value, key_pb) def test_order(self): - from gcloud.datastore._generated import query_pb2 + from google.cloud.datastore._generated import query_pb2 pb = self._callFUT(_Query(order=['a', '-b', 'c'])) self.assertEqual([item.property.name for item in pb.order], diff --git a/unit_tests/datastore/test_transaction.py b/unit_tests/datastore/test_transaction.py index a093a99f7ac2..f3c1225af6d7 100644 --- a/unit_tests/datastore/test_transaction.py +++ b/unit_tests/datastore/test_transaction.py @@ -18,14 +18,14 @@ class TestTransaction(unittest.TestCase): def _getTargetClass(self): - from gcloud.datastore.transaction import Transaction + from google.cloud.datastore.transaction import Transaction return Transaction def _makeOne(self, client, **kw): return self._getTargetClass()(client, **kw) def test_ctor_defaults(self): - from gcloud.datastore._generated import datastore_pb2 + from google.cloud.datastore._generated import datastore_pb2 _PROJECT = 'PROJECT' connection = _Connection() @@ -164,7 +164,7 @@ class Foo(Exception): def _make_key(kind, id_, project): - from gcloud.datastore._generated import entity_pb2 + from google.cloud.datastore._generated import entity_pb2 key = entity_pb2.Key() key.partition_id.project_id = project @@ -199,7 +199,7 @@ class _Entity(dict): def __init__(self): super(_Entity, self).__init__() - from gcloud.datastore.key import Key + from google.cloud.datastore.key import Key self.key = Key('KIND', project='PROJECT') @@ -225,7 +225,7 @@ def current_batch(self): class _NoCommitBatch(object): def __init__(self, client): - from gcloud.datastore.batch import Batch + from google.cloud.datastore.batch import Batch self._client = client self._batch = Batch(client) diff --git a/unit_tests/dns/test_changes.py b/unit_tests/dns/test_changes.py index 986861d2530f..0fa5d6a9f8d1 100644 --- a/unit_tests/dns/test_changes.py +++ b/unit_tests/dns/test_changes.py @@ -21,19 +21,19 @@ class TestChanges(unittest.TestCase): CHANGES_NAME = 'changeset_id' def _getTargetClass(self): - from gcloud.dns.changes import Changes + from google.cloud.dns.changes import Changes return Changes def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) def _setUpConstants(self): - from gcloud._helpers import UTC - from gcloud._helpers import _NOW + from google.cloud._helpers import UTC + from google.cloud._helpers import _NOW self.WHEN = _NOW().replace(tzinfo=UTC) def _makeResource(self): - from gcloud._helpers import _datetime_to_rfc3339 + from google.cloud._helpers import _datetime_to_rfc3339 when_str = _datetime_to_rfc3339(self.WHEN) return { 'kind': 'dns#change', @@ -55,7 +55,7 @@ def _makeResource(self): } def _verifyResourceProperties(self, changes, resource, zone): - from gcloud._helpers import _rfc3339_to_datetime + from google.cloud._helpers import _rfc3339_to_datetime self.assertEqual(changes.name, resource['id']) started = _rfc3339_to_datetime(resource['startTime']) self.assertEqual(changes.started, started) @@ -133,7 +133,7 @@ def test_add_record_set_invalid_value(self): changes.add_record_set(object()) def test_add_record_set(self): - from gcloud.dns.resource_record_set import ResourceRecordSet + from google.cloud.dns.resource_record_set import ResourceRecordSet zone = _Zone() changes = self._makeOne(zone) rrs = ResourceRecordSet('test.example.com', 'CNAME', 3600, @@ -149,7 +149,7 @@ def test_delete_record_set_invalid_value(self): changes.delete_record_set(object()) def test_delete_record_set(self): - from gcloud.dns.resource_record_set import ResourceRecordSet + from google.cloud.dns.resource_record_set import ResourceRecordSet zone = _Zone() changes = self._makeOne(zone) rrs = ResourceRecordSet('test.example.com', 'CNAME', 3600, @@ -171,7 +171,7 @@ def test_create_wo_additions_or_deletions(self): self.assertEqual(len(conn._requested), 0) def test_create_w_bound_client(self): - from gcloud.dns.resource_record_set import ResourceRecordSet + from google.cloud.dns.resource_record_set import ResourceRecordSet self._setUpConstants() RESOURCE = self._makeResource() PATH = 'projects/%s/managedZones/%s/changes' % ( @@ -199,7 +199,7 @@ def test_create_w_bound_client(self): self._verifyResourceProperties(changes, RESOURCE, zone) def test_create_w_alternate_client(self): - from gcloud.dns.resource_record_set import ResourceRecordSet + from google.cloud.dns.resource_record_set import ResourceRecordSet self._setUpConstants() RESOURCE = self._makeResource() PATH = 'projects/%s/managedZones/%s/changes' % ( @@ -332,7 +332,7 @@ def __init__(self, *responses): self._requested = [] def api_request(self, **kw): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._requested.append(kw) try: diff --git a/unit_tests/dns/test_client.py b/unit_tests/dns/test_client.py index 9ff26b19ff63..2bf0c0e04428 100644 --- a/unit_tests/dns/test_client.py +++ b/unit_tests/dns/test_client.py @@ -21,14 +21,14 @@ class TestClient(unittest.TestCase): ZONE_NAME = 'zone-name' def _getTargetClass(self): - from gcloud.dns.client import Client + from google.cloud.dns.client import Client return Client def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) def test_ctor(self): - from gcloud.dns.connection import Connection + from google.cloud.dns.connection import Connection creds = _Credentials() http = object() client = self._makeOne(project=self.PROJECT, credentials=creds, @@ -106,7 +106,7 @@ def test_quotas_w_kind_key(self): self.assertEqual(req['path'], '/%s' % PATH) def test_list_zones_defaults(self): - from gcloud.dns.zone import ManagedZone + from google.cloud.dns.zone import ManagedZone ID_1 = '123' ZONE_1 = 'zone_one' DNS_1 = 'one.example.com' @@ -148,7 +148,7 @@ def test_list_zones_defaults(self): self.assertEqual(req['path'], '/%s' % PATH) def test_list_zones_explicit(self): - from gcloud.dns.zone import ManagedZone + from google.cloud.dns.zone import ManagedZone ID_1 = '123' ZONE_1 = 'zone_one' DNS_1 = 'one.example.com' @@ -191,7 +191,7 @@ def test_list_zones_explicit(self): {'maxResults': 3, 'pageToken': TOKEN}) def test_zone_explicit(self): - from gcloud.dns.zone import ManagedZone + from google.cloud.dns.zone import ManagedZone DESCRIPTION = 'DESCRIPTION' DNS_NAME = 'test.example.com' creds = _Credentials() @@ -204,7 +204,7 @@ def test_zone_explicit(self): self.assertTrue(zone._client is client) def test_zone_w_dns_name_wo_description(self): - from gcloud.dns.zone import ManagedZone + from google.cloud.dns.zone import ManagedZone DNS_NAME = 'test.example.com' creds = _Credentials() client = self._makeOne(self.PROJECT, creds) @@ -216,7 +216,7 @@ def test_zone_w_dns_name_wo_description(self): self.assertTrue(zone._client is client) def test_zone_wo_dns_name(self): - from gcloud.dns.zone import ManagedZone + from google.cloud.dns.zone import ManagedZone creds = _Credentials() client = self._makeOne(self.PROJECT, creds) zone = client.zone(self.ZONE_NAME) diff --git a/unit_tests/dns/test_connection.py b/unit_tests/dns/test_connection.py index 818c622a6dce..80bbde5667da 100644 --- a/unit_tests/dns/test_connection.py +++ b/unit_tests/dns/test_connection.py @@ -18,7 +18,7 @@ class TestConnection(unittest.TestCase): def _getTargetClass(self): - from gcloud.dns.connection import Connection + from google.cloud.dns.connection import Connection return Connection def _makeOne(self, *args, **kw): diff --git a/unit_tests/dns/test_resource_record_set.py b/unit_tests/dns/test_resource_record_set.py index b548453d443e..9ced4ad5e783 100644 --- a/unit_tests/dns/test_resource_record_set.py +++ b/unit_tests/dns/test_resource_record_set.py @@ -18,7 +18,7 @@ class TestResourceRecordSet(unittest.TestCase): def _getTargetClass(self): - from gcloud.dns.resource_record_set import ResourceRecordSet + from google.cloud.dns.resource_record_set import ResourceRecordSet return ResourceRecordSet def _makeOne(self, *args, **kw): diff --git a/unit_tests/dns/test_zone.py b/unit_tests/dns/test_zone.py index d4c89e57f641..611583955d37 100644 --- a/unit_tests/dns/test_zone.py +++ b/unit_tests/dns/test_zone.py @@ -22,7 +22,7 @@ class TestManagedZone(unittest.TestCase): DNS_NAME = 'test.example.com' def _getTargetClass(self): - from gcloud.dns.zone import ManagedZone + from google.cloud.dns.zone import ManagedZone return ManagedZone def _makeOne(self, *args, **kw): @@ -30,7 +30,7 @@ def _makeOne(self, *args, **kw): def _setUpConstants(self): import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC year = 2015 month = 7 @@ -184,7 +184,7 @@ def test_name_server_set_setter(self): self.assertEqual(zone.name_server_set, 'NAME_SERVER_SET') def test_resource_record_set(self): - from gcloud.dns.resource_record_set import ResourceRecordSet + from google.cloud.dns.resource_record_set import ResourceRecordSet RRS_NAME = 'other.example.com' RRS_TYPE = 'CNAME' TTL = 3600 @@ -200,7 +200,7 @@ def test_resource_record_set(self): self.assertTrue(rrs.zone is zone) def test_changes(self): - from gcloud.dns.changes import Changes + from google.cloud.dns.changes import Changes client = _Client(self.PROJECT) zone = self._makeOne(self.ZONE_NAME, self.DNS_NAME, client) changes = zone.changes() @@ -260,7 +260,7 @@ def test_create_w_alternate_client(self): self._verifyResourceProperties(zone, RESOURCE) def test_create_wo_dns_name_or_description(self): - from gcloud.exceptions import BadRequest + from google.cloud.exceptions import BadRequest PATH = 'projects/%s/managedZones' % self.PROJECT _requested = [] @@ -409,7 +409,7 @@ def test_delete_w_alternate_client(self): self.assertEqual(req['path'], '/%s' % PATH) def test_list_resource_record_sets_defaults(self): - from gcloud.dns.resource_record_set import ResourceRecordSet + from google.cloud.dns.resource_record_set import ResourceRecordSet PATH = 'projects/%s/managedZones/%s/rrsets' % ( self.PROJECT, self.ZONE_NAME) TOKEN = 'TOKEN' @@ -457,7 +457,7 @@ def test_list_resource_record_sets_defaults(self): self.assertEqual(req['path'], '/%s' % PATH) def test_list_resource_record_sets_explicit(self): - from gcloud.dns.resource_record_set import ResourceRecordSet + from google.cloud.dns.resource_record_set import ResourceRecordSet PATH = 'projects/%s/managedZones/%s/rrsets' % ( self.PROJECT, self.ZONE_NAME) TOKEN = 'TOKEN' @@ -510,9 +510,9 @@ def test_list_resource_record_sets_explicit(self): {'maxResults': 3, 'pageToken': TOKEN}) def test_list_changes_defaults(self): - from gcloud._helpers import _datetime_to_rfc3339 - from gcloud.dns.changes import Changes - from gcloud.dns.resource_record_set import ResourceRecordSet + from google.cloud._helpers import _datetime_to_rfc3339 + from google.cloud.dns.changes import Changes + from google.cloud.dns.resource_record_set import ResourceRecordSet self._setUpConstants() PATH = 'projects/%s/managedZones/%s/changes' % ( self.PROJECT, self.ZONE_NAME) @@ -586,9 +586,9 @@ def test_list_changes_defaults(self): self.assertEqual(req['path'], '/%s' % PATH) def test_list_changes_explicit(self): - from gcloud._helpers import _datetime_to_rfc3339 - from gcloud.dns.changes import Changes - from gcloud.dns.resource_record_set import ResourceRecordSet + from google.cloud._helpers import _datetime_to_rfc3339 + from google.cloud.dns.changes import Changes + from google.cloud.dns.resource_record_set import ResourceRecordSet self._setUpConstants() PATH = 'projects/%s/managedZones/%s/changes' % ( self.PROJECT, self.ZONE_NAME) @@ -681,7 +681,7 @@ def __init__(self, *responses): self._requested = [] def api_request(self, **kw): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._requested.append(kw) try: diff --git a/unit_tests/error_reporting/test_client.py b/unit_tests/error_reporting/test_client.py index 873673ca5596..f4ba0c9c46af 100644 --- a/unit_tests/error_reporting/test_client.py +++ b/unit_tests/error_reporting/test_client.py @@ -19,11 +19,11 @@ class TestClient(unittest.TestCase): def _getTargetClass(self): - from gcloud.error_reporting.client import Client + from google.cloud.error_reporting.client import Client return Client def _getHttpContext(self): - from gcloud.error_reporting.client import HTTPContext + from google.cloud.error_reporting.client import HTTPContext return HTTPContext def _makeOne(self, *args, **kw): diff --git a/unit_tests/language/test_client.py b/unit_tests/language/test_client.py index abfd85b47354..ff357772887a 100644 --- a/unit_tests/language/test_client.py +++ b/unit_tests/language/test_client.py @@ -18,14 +18,14 @@ class TestClient(unittest.TestCase): def _getTargetClass(self): - from gcloud.language.client import Client + from google.cloud.language.client import Client return Client def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) def test_ctor(self): - from gcloud.language.connection import Connection + from google.cloud.language.connection import Connection creds = _Credentials() http = object() @@ -35,7 +35,7 @@ def test_ctor(self): self.assertTrue(client.connection.http is http) def test_document_from_text_factory(self): - from gcloud.language.document import Document + from google.cloud.language.document import Document creds = _Credentials() client = self._makeOne(credentials=creds, http=object()) @@ -59,7 +59,7 @@ def test_document_from_text_factory_failure(self): client.document_from_text('abc', doc_type='foo') def test_document_from_html_factory(self): - from gcloud.language.document import Document + from google.cloud.language.document import Document creds = _Credentials() client = self._makeOne(credentials=creds, http=object()) @@ -83,7 +83,7 @@ def test_document_from_html_factory_failure(self): client.document_from_html('abc', doc_type='foo') def test_document_from_url_factory(self): - from gcloud.language.document import Document + from google.cloud.language.document import Document creds = _Credentials() client = self._makeOne(credentials=creds, http=object()) @@ -97,8 +97,8 @@ def test_document_from_url_factory(self): self.assertEqual(document.doc_type, Document.PLAIN_TEXT) def test_document_from_url_factory_explicit(self): - from gcloud.language.document import Document - from gcloud.language.document import Encoding + from google.cloud.language.document import Document + from google.cloud.language.document import Encoding creds = _Credentials() client = self._makeOne(credentials=creds, http=object()) diff --git a/unit_tests/language/test_connection.py b/unit_tests/language/test_connection.py index 5ba49c2bd849..72666cdcf83d 100644 --- a/unit_tests/language/test_connection.py +++ b/unit_tests/language/test_connection.py @@ -18,7 +18,7 @@ class TestConnection(unittest.TestCase): def _getTargetClass(self): - from gcloud.language.connection import Connection + from google.cloud.language.connection import Connection return Connection def _makeOne(self, *args, **kw): diff --git a/unit_tests/language/test_document.py b/unit_tests/language/test_document.py index a99564fe0c0e..8a6b75becf46 100644 --- a/unit_tests/language/test_document.py +++ b/unit_tests/language/test_document.py @@ -40,7 +40,7 @@ def _make_token_json(name, part_of_speech, head, edge_label): def _get_token_and_sentences(include_syntax): - from gcloud.language.syntax import PartOfSpeech + from google.cloud.language.syntax import PartOfSpeech if include_syntax: token_info = [ @@ -68,7 +68,7 @@ def _get_token_and_sentences(include_syntax): def _get_entities(include_entities): - from gcloud.language.entity import EntityType + from google.cloud.language.entity import EntityType if include_entities: entities = [ @@ -98,14 +98,14 @@ def _get_entities(include_entities): class TestDocument(unittest.TestCase): def _getTargetClass(self): - from gcloud.language.document import Document + from google.cloud.language.document import Document return Document def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) def test_constructor_defaults(self): - import gcloud.language.document as MUT + import google.cloud.language.document as MUT client = object() content = 'abc' @@ -118,7 +118,7 @@ def test_constructor_defaults(self): self.assertEqual(document.encoding, MUT.Encoding.UTF8) def test_constructor_explicit(self): - import gcloud.language.document as MUT + import google.cloud.language.document as MUT client = object() gcs_url = 'gs://some-bucket/some-obj.html' @@ -176,7 +176,7 @@ def test__to_dict_with_no_content(self): }) def _verify_entity(self, entity, name, entity_type, wiki_url, salience): - from gcloud.language.entity import Entity + from google.cloud.language.entity import Entity self.assertIsInstance(entity, Entity) self.assertEqual(entity.name, name) @@ -187,7 +187,7 @@ def _verify_entity(self, entity, name, entity_type, wiki_url, salience): self.assertEqual(entity.mentions, [name]) def test_analyze_entities(self): - from gcloud.language.entity import EntityType + from google.cloud.language.entity import EntityType name1 = 'R-O-C-K' name2 = 'USA' @@ -248,7 +248,7 @@ def test_analyze_entities(self): self.assertEqual(req['method'], 'POST') def _verify_sentiment(self, sentiment, polarity, magnitude): - from gcloud.language.sentiment import Sentiment + from google.cloud.language.sentiment import Sentiment self.assertIsInstance(sentiment, Sentiment) self.assertEqual(sentiment.polarity, polarity) @@ -279,7 +279,7 @@ def test_analyze_sentiment(self): self.assertEqual(req['method'], 'POST') def _verify_sentences(self, include_syntax, annotations): - from gcloud.language.syntax import Sentence + from google.cloud.language.syntax import Sentence if include_syntax: self.assertEqual(len(annotations.sentences), 1) @@ -291,7 +291,7 @@ def _verify_sentences(self, include_syntax, annotations): self.assertEqual(annotations.sentences, []) def _verify_tokens(self, annotations, token_info): - from gcloud.language.syntax import Token + from google.cloud.language.syntax import Token self.assertEqual(len(annotations.tokens), len(token_info)) for token, info in zip(annotations.tokens, token_info): @@ -305,8 +305,8 @@ def _verify_tokens(self, annotations, token_info): def _annotate_text_helper(self, include_sentiment, include_entities, include_syntax): - from gcloud.language.document import Annotations - from gcloud.language.entity import EntityType + from google.cloud.language.document import Annotations + from google.cloud.language.entity import EntityType token_info, sentences = _get_token_and_sentences(include_syntax) entities = _get_entities(include_entities) diff --git a/unit_tests/language/test_entity.py b/unit_tests/language/test_entity.py index 34dde32c0ae1..eb58f40d1f9d 100644 --- a/unit_tests/language/test_entity.py +++ b/unit_tests/language/test_entity.py @@ -18,7 +18,7 @@ class TestEntity(unittest.TestCase): def _getTargetClass(self): - from gcloud.language.entity import Entity + from google.cloud.language.entity import Entity return Entity def _makeOne(self, *args, **kw): diff --git a/unit_tests/language/test_sentiment.py b/unit_tests/language/test_sentiment.py index beafb74976a9..de24665cbf7b 100644 --- a/unit_tests/language/test_sentiment.py +++ b/unit_tests/language/test_sentiment.py @@ -18,7 +18,7 @@ class TestSentiment(unittest.TestCase): def _getTargetClass(self): - from gcloud.language.sentiment import Sentiment + from google.cloud.language.sentiment import Sentiment return Sentiment def _makeOne(self, *args, **kw): diff --git a/unit_tests/language/test_syntax.py b/unit_tests/language/test_syntax.py index 5524b2166a2a..53718956581e 100644 --- a/unit_tests/language/test_syntax.py +++ b/unit_tests/language/test_syntax.py @@ -18,7 +18,7 @@ class TestPartOfSpeech(unittest.TestCase): def _getTargetClass(self): - from gcloud.language.syntax import PartOfSpeech + from google.cloud.language.syntax import PartOfSpeech return PartOfSpeech def test_reverse(self): @@ -36,14 +36,14 @@ def test_reverse(self): class TestToken(unittest.TestCase): def _getTargetClass(self): - from gcloud.language.syntax import Token + from google.cloud.language.syntax import Token return Token def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) def test_constructor(self): - from gcloud.language.syntax import PartOfSpeech + from google.cloud.language.syntax import PartOfSpeech text_content = 'All' text_begin = -1 @@ -61,7 +61,7 @@ def test_constructor(self): self.assertEqual(token.lemma, lemma) def test_from_api_repr(self): - from gcloud.language.syntax import PartOfSpeech + from google.cloud.language.syntax import PartOfSpeech klass = self._getTargetClass() text_content = 'pretty' @@ -96,7 +96,7 @@ def test_from_api_repr(self): class TestSentence(unittest.TestCase): def _getTargetClass(self): - from gcloud.language.syntax import Sentence + from google.cloud.language.syntax import Sentence return Sentence def _makeOne(self, *args, **kw): diff --git a/unit_tests/logging/handlers/test_handlers.py b/unit_tests/logging/handlers/test_handlers.py index 60ede6a5bf6c..6e7d807996e2 100644 --- a/unit_tests/logging/handlers/test_handlers.py +++ b/unit_tests/logging/handlers/test_handlers.py @@ -21,7 +21,7 @@ class TestCloudLoggingHandler(unittest.TestCase): PROJECT = 'PROJECT' def _getTargetClass(self): - from gcloud.logging.handlers.handlers import CloudLoggingHandler + from google.cloud.logging.handlers.handlers import CloudLoggingHandler return CloudLoggingHandler def _makeOne(self, *args, **kw): @@ -46,7 +46,7 @@ def test_emit(self): class TestSetupLogging(unittest.TestCase): def _callFUT(self, handler, excludes=None): - from gcloud.logging.handlers.handlers import setup_logging + from google.cloud.logging.handlers.handlers import setup_logging if excludes: return setup_logging(handler, excluded_loggers=excludes) else: diff --git a/unit_tests/logging/handlers/transports/test_background_thread.py b/unit_tests/logging/handlers/transports/test_background_thread.py index 5f9b5eb8ca32..d74881c67b61 100644 --- a/unit_tests/logging/handlers/transports/test_background_thread.py +++ b/unit_tests/logging/handlers/transports/test_background_thread.py @@ -22,7 +22,7 @@ class TestBackgroundThreadHandler(unittest.TestCase): PROJECT = 'PROJECT' def _getTargetClass(self): - from gcloud.logging.handlers.transports import ( + from google.cloud.logging.handlers.transports import ( BackgroundThreadTransport) return BackgroundThreadTransport @@ -58,9 +58,8 @@ def test_send(self): class TestWorker(unittest.TestCase): def _getTargetClass(self): - from gcloud.logging.handlers.transports.background_thread import ( - _Worker) - return _Worker + from google.cloud.logging.handlers.transports import background_thread + return background_thread._Worker def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) diff --git a/unit_tests/logging/handlers/transports/test_base.py b/unit_tests/logging/handlers/transports/test_base.py index 32b11dcb8400..6aa2e47f84b6 100644 --- a/unit_tests/logging/handlers/transports/test_base.py +++ b/unit_tests/logging/handlers/transports/test_base.py @@ -20,7 +20,7 @@ class TestBaseHandler(unittest.TestCase): PROJECT = 'PROJECT' def _getTargetClass(self): - from gcloud.logging.handlers.transports import Transport + from google.cloud.logging.handlers.transports import Transport return Transport def _makeOne(self, *args, **kw): diff --git a/unit_tests/logging/handlers/transports/test_sync.py b/unit_tests/logging/handlers/transports/test_sync.py index a252541948da..d99933c7efea 100644 --- a/unit_tests/logging/handlers/transports/test_sync.py +++ b/unit_tests/logging/handlers/transports/test_sync.py @@ -21,7 +21,7 @@ class TestSyncHandler(unittest.TestCase): PROJECT = 'PROJECT' def _getTargetClass(self): - from gcloud.logging.handlers.transports import SyncTransport + from google.cloud.logging.handlers.transports import SyncTransport return SyncTransport def _makeOne(self, *args, **kw): diff --git a/unit_tests/logging/test__gax.py b/unit_tests/logging/test__gax.py index cd4795356a44..a9e519bf5b4e 100644 --- a/unit_tests/logging/test__gax.py +++ b/unit_tests/logging/test__gax.py @@ -17,7 +17,7 @@ try: # pylint: disable=unused-import - import gcloud.logging._gax + import google.cloud.logging._gax # pylint: enable=unused-import except ImportError: # pragma: NO COVER _HAVE_GAX = False @@ -41,7 +41,7 @@ class Test_LoggingAPI(_Base, unittest.TestCase): LOG_NAME = 'log_name' def _getTargetClass(self): - from gcloud.logging._gax import _LoggingAPI + from google.cloud.logging._gax import _LoggingAPI return _LoggingAPI def test_ctor(self): @@ -51,7 +51,7 @@ def test_ctor(self): def test_list_entries_no_paging(self): from google.gax import INITIAL_PAGE - from gcloud.logging import DESCENDING + from google.cloud.logging.client import DESCENDING from unit_tests._testing import _GAXPageIterator TOKEN = 'TOKEN' TEXT = 'TEXT' @@ -116,9 +116,9 @@ def test_list_entries_with_extra_properties(self): from datetime import datetime from google.logging.type.log_severity_pb2 import WARNING from unit_tests._testing import _GAXPageIterator - from gcloud._helpers import UTC - from gcloud._helpers import _datetime_to_rfc3339 - from gcloud._helpers import _datetime_to_pb_timestamp + from google.cloud._helpers import UTC + from google.cloud._helpers import _datetime_to_rfc3339 + from google.cloud._helpers import _datetime_to_pb_timestamp NOW = datetime.utcnow().replace(tzinfo=UTC) SIZE = 23 TOKEN = 'TOKEN' @@ -224,7 +224,7 @@ def test_write_entries_w_extra_properties(self): from datetime import datetime from google.logging.type.log_severity_pb2 import WARNING from google.logging.v2.log_entry_pb2 import LogEntry - from gcloud._helpers import UTC, _pb_timestamp_to_datetime + from google.cloud._helpers import UTC, _pb_timestamp_to_datetime NOW = datetime.utcnow().replace(tzinfo=UTC) TEXT = 'TEXT' LOG_PATH = 'projects/%s/logs/%s' % (self.PROJECT, self.LOG_NAME) @@ -322,7 +322,7 @@ def test_write_entries_multiple(self): from google.logging.v2.log_entry_pb2 import LogEntry from google.protobuf.any_pb2 import Any from google.protobuf.struct_pb2 import Struct - from gcloud._helpers import _datetime_to_rfc3339, UTC + from google.cloud._helpers import _datetime_to_rfc3339, UTC TEXT = 'TEXT' NOW = datetime.datetime.utcnow().replace(tzinfo=UTC) TIMESTAMP_TYPE_URL = 'type.googleapis.com/google.protobuf.Timestamp' @@ -409,7 +409,7 @@ def test_logger_delete(self): self.assertEqual(options, None) def test_logger_delete_not_found(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound LOG_PATH = 'projects/%s/logs/%s' % (self.PROJECT, self.LOG_NAME) gax_api = _GAXLoggingAPI(_delete_not_found=True) api = self._makeOne(gax_api) @@ -442,7 +442,7 @@ class Test_SinksAPI(_Base, unittest.TestCase): DESTINATION_URI = 'faux.googleapis.com/destination' def _getTargetClass(self): - from gcloud.logging._gax import _SinksAPI + from google.cloud.logging._gax import _SinksAPI return _SinksAPI def test_ctor(self): @@ -512,7 +512,7 @@ def test_sink_create_error(self): self.DESTINATION_URI) def test_sink_create_conflict(self): - from gcloud.exceptions import Conflict + from google.cloud.exceptions import Conflict gax_api = _GAXSinksAPI(_create_sink_conflict=True) api = self._makeOne(gax_api) @@ -539,7 +539,7 @@ def test_sink_create_ok(self): self.assertEqual(options, None) def test_sink_get_error(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound gax_api = _GAXSinksAPI() api = self._makeOne(gax_api) @@ -584,7 +584,7 @@ def test_sink_update_error(self): self.DESTINATION_URI) def test_sink_update_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound gax_api = _GAXSinksAPI() api = self._makeOne(gax_api) @@ -621,7 +621,7 @@ def test_sink_delete_error(self): api.sink_delete(self.PROJECT, self.SINK_NAME) def test_sink_delete_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound gax_api = _GAXSinksAPI(_sink_not_found=True) api = self._makeOne(gax_api) @@ -646,7 +646,7 @@ class Test_MetricsAPI(_Base, unittest.TestCase): DESCRIPTION = 'Description' def _getTargetClass(self): - from gcloud.logging._gax import _MetricsAPI + from google.cloud.logging._gax import _MetricsAPI return _MetricsAPI def test_ctor(self): @@ -716,7 +716,7 @@ def test_metric_create_error(self): self.DESCRIPTION) def test_metric_create_conflict(self): - from gcloud.exceptions import Conflict + from google.cloud.exceptions import Conflict gax_api = _GAXMetricsAPI(_create_log_metric_conflict=True) api = self._makeOne(gax_api) @@ -743,7 +743,7 @@ def test_metric_create_ok(self): self.assertEqual(options, None) def test_metric_get_error(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound gax_api = _GAXMetricsAPI() api = self._makeOne(gax_api) @@ -788,7 +788,7 @@ def test_metric_update_error(self): self.DESCRIPTION) def test_metric_update_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound gax_api = _GAXMetricsAPI() api = self._makeOne(gax_api) @@ -825,7 +825,7 @@ def test_metric_delete_error(self): api.metric_delete(self.PROJECT, self.METRIC_NAME) def test_metric_delete_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound gax_api = _GAXMetricsAPI(_log_metric_not_found=True) api = self._makeOne(gax_api) @@ -847,7 +847,7 @@ def test_metric_delete_hit(self): class Test_value_pb_to_value(_Base, unittest.TestCase): def _callFUT(self, value_pb): - from gcloud.logging._gax import _value_pb_to_value + from google.cloud.logging._gax import _value_pb_to_value return _value_pb_to_value(value_pb) def test_w_null_values(self): @@ -1080,8 +1080,8 @@ def HasField(self, field_name): @staticmethod def _make_timestamp(): from datetime import datetime - from gcloud._helpers import UTC - from gcloud._helpers import _datetime_to_pb_timestamp + from google.cloud._helpers import UTC + from google.cloud._helpers import _datetime_to_pb_timestamp NOW = datetime.utcnow().replace(tzinfo=UTC) return _datetime_to_pb_timestamp(NOW) diff --git a/unit_tests/logging/test_client.py b/unit_tests/logging/test_client.py index 779a5b1729b0..5f938436efa9 100644 --- a/unit_tests/logging/test_client.py +++ b/unit_tests/logging/test_client.py @@ -27,7 +27,7 @@ class TestClient(unittest.TestCase): DESCRIPTION = 'DESCRIPTION' def _getTargetClass(self): - from gcloud.logging.client import Client + from google.cloud.logging.client import Client return Client def _makeOne(self, *args, **kw): @@ -39,8 +39,8 @@ def test_ctor(self): self.assertEqual(client.project, self.PROJECT) def test_logging_api_wo_gax(self): - from gcloud.logging.connection import _LoggingAPI - from gcloud.logging import client as MUT + from google.cloud.logging.connection import _LoggingAPI + from google.cloud.logging import client as MUT from unit_tests._testing import _Monkey client = self._makeOne(self.PROJECT, credentials=_Credentials()) conn = client.connection = object() @@ -55,7 +55,7 @@ def test_logging_api_wo_gax(self): self.assertTrue(again is api) def test_logging_api_w_gax(self): - from gcloud.logging import client as MUT + from google.cloud.logging import client as MUT from unit_tests._testing import _Monkey wrapped = object() @@ -86,8 +86,8 @@ def __init__(self, _wrapped): self.assertTrue(again is api) def test_sinks_api_wo_gax(self): - from gcloud.logging.connection import _SinksAPI - from gcloud.logging import client as MUT + from google.cloud.logging.connection import _SinksAPI + from google.cloud.logging import client as MUT from unit_tests._testing import _Monkey client = self._makeOne(self.PROJECT, credentials=_Credentials()) conn = client.connection = object() @@ -102,7 +102,7 @@ def test_sinks_api_wo_gax(self): self.assertTrue(again is api) def test_sinks_api_w_gax(self): - from gcloud.logging import client as MUT + from google.cloud.logging import client as MUT from unit_tests._testing import _Monkey wrapped = object() @@ -133,8 +133,8 @@ def __init__(self, _wrapped): self.assertTrue(again is api) def test_metrics_api_wo_gax(self): - from gcloud.logging.connection import _MetricsAPI - from gcloud.logging import client as MUT + from google.cloud.logging.connection import _MetricsAPI + from google.cloud.logging import client as MUT from unit_tests._testing import _Monkey client = self._makeOne(self.PROJECT, credentials=_Credentials()) conn = client.connection = object() @@ -149,7 +149,7 @@ def test_metrics_api_wo_gax(self): self.assertTrue(again is api) def test_metrics_api_w_gax(self): - from gcloud.logging import client as MUT + from google.cloud.logging import client as MUT from unit_tests._testing import _Monkey wrapped = object() @@ -180,7 +180,7 @@ def __init__(self, _wrapped): self.assertTrue(again is api) def test_logger(self): - from gcloud.logging.logger import Logger + from google.cloud.logging.logger import Logger creds = _Credentials() client = self._makeOne(project=self.PROJECT, credentials=creds) logger = client.logger(self.LOGGER_NAME) @@ -198,7 +198,7 @@ def test__entry_from_resource_unknown_type(self): client._entry_from_resource({'unknownPayload': {}}, loggers) def test_list_entries_defaults(self): - from gcloud.logging.entries import TextEntry + from google.cloud.logging.entries import TextEntry IID = 'IID' TEXT = 'TEXT' TOKEN = 'TOKEN' @@ -234,10 +234,10 @@ def test_list_entries_defaults(self): ([self.PROJECT], None, None, None, None)) def test_list_entries_explicit(self): - from gcloud.logging import DESCENDING - from gcloud.logging.entries import ProtobufEntry - from gcloud.logging.entries import StructEntry - from gcloud.logging.logger import Logger + from google.cloud.logging.client import DESCENDING + from google.cloud.logging.entries import ProtobufEntry + from google.cloud.logging.entries import StructEntry + from google.cloud.logging.logger import Logger PROJECT1 = 'PROJECT1' PROJECT2 = 'PROJECT2' FILTER = 'logName:LOGNAME' @@ -301,7 +301,7 @@ def test_list_entries_explicit(self): ([PROJECT1, PROJECT2], FILTER, DESCENDING, PAGE_SIZE, TOKEN)) def test_sink_defaults(self): - from gcloud.logging.sink import Sink + from google.cloud.logging.sink import Sink creds = _Credentials() client = self._makeOne(project=self.PROJECT, credentials=creds) sink = client.sink(self.SINK_NAME) @@ -313,7 +313,7 @@ def test_sink_defaults(self): self.assertEqual(sink.project, self.PROJECT) def test_sink_explicit(self): - from gcloud.logging.sink import Sink + from google.cloud.logging.sink import Sink creds = _Credentials() client = self._makeOne(project=self.PROJECT, credentials=creds) sink = client.sink(self.SINK_NAME, self.FILTER, self.DESTINATION_URI) @@ -325,7 +325,7 @@ def test_sink_explicit(self): self.assertEqual(sink.project, self.PROJECT) def test_list_sinks_no_paging(self): - from gcloud.logging.sink import Sink + from google.cloud.logging.sink import Sink PROJECT = 'PROJECT' TOKEN = 'TOKEN' SINK_NAME = 'sink_name' @@ -353,7 +353,7 @@ def test_list_sinks_no_paging(self): (PROJECT, None, None)) def test_list_sinks_with_paging(self): - from gcloud.logging.sink import Sink + from google.cloud.logging.sink import Sink PROJECT = 'PROJECT' SINK_NAME = 'sink_name' FILTER = 'logName:syslog AND severity>=ERROR' @@ -381,7 +381,7 @@ def test_list_sinks_with_paging(self): (PROJECT, PAGE_SIZE, TOKEN)) def test_metric_defaults(self): - from gcloud.logging.metric import Metric + from google.cloud.logging.metric import Metric creds = _Credentials() client_obj = self._makeOne(project=self.PROJECT, credentials=creds) @@ -394,7 +394,7 @@ def test_metric_defaults(self): self.assertEqual(metric.project, self.PROJECT) def test_metric_explicit(self): - from gcloud.logging.metric import Metric + from google.cloud.logging.metric import Metric creds = _Credentials() client_obj = self._makeOne(project=self.PROJECT, credentials=creds) @@ -408,7 +408,7 @@ def test_metric_explicit(self): self.assertEqual(metric.project, self.PROJECT) def test_list_metrics_no_paging(self): - from gcloud.logging.metric import Metric + from google.cloud.logging.metric import Metric PROJECT = 'PROJECT' TOKEN = 'TOKEN' METRICS = [{ @@ -433,7 +433,7 @@ def test_list_metrics_no_paging(self): (PROJECT, None, None)) def test_list_metrics_with_paging(self): - from gcloud.logging.metric import Metric + from google.cloud.logging.metric import Metric PROJECT = 'PROJECT' TOKEN = 'TOKEN' PAGE_SIZE = 42 diff --git a/unit_tests/logging/test_connection.py b/unit_tests/logging/test_connection.py index 7108bf5fff40..cd6668370049 100644 --- a/unit_tests/logging/test_connection.py +++ b/unit_tests/logging/test_connection.py @@ -21,7 +21,7 @@ class TestConnection(unittest.TestCase): FILTER = 'logName:syslog AND severity>=ERROR' def _getTargetClass(self): - from gcloud.logging.connection import Connection + from google.cloud.logging.connection import Connection return Connection def _makeOne(self, *args, **kw): @@ -43,7 +43,7 @@ class Test_LoggingAPI(unittest.TestCase): FILTER = 'logName:syslog AND severity>=ERROR' def _getTargetClass(self): - from gcloud.logging.connection import _LoggingAPI + from google.cloud.logging.connection import _LoggingAPI return _LoggingAPI def _makeOne(self, *args, **kw): @@ -57,7 +57,7 @@ def test_ctor(self): @staticmethod def _make_timestamp(): from datetime import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC NOW = datetime.utcnow().replace(tzinfo=UTC) return _datetime_to_rfc3339_w_nanos(NOW) @@ -97,7 +97,7 @@ def test_list_entries_no_paging(self): self.assertEqual(conn._called_with['data'], SENT) def test_list_entries_w_paging(self): - from gcloud.logging import DESCENDING + from google.cloud.logging.client import DESCENDING PROJECT1 = 'PROJECT1' PROJECT2 = 'PROJECT2' TIMESTAMP = self._make_timestamp() @@ -227,7 +227,7 @@ class Test_SinksAPI(unittest.TestCase): DESTINATION_URI = 'faux.googleapis.com/destination' def _getTargetClass(self): - from gcloud.logging.connection import _SinksAPI + from google.cloud.logging.connection import _SinksAPI return _SinksAPI def _makeOne(self, *args, **kw): @@ -287,7 +287,7 @@ def test_list_sinks_w_paging(self): {'pageSize': PAGE_SIZE, 'pageToken': TOKEN}) def test_sink_create_conflict(self): - from gcloud.exceptions import Conflict + from google.cloud.exceptions import Conflict SENT = { 'name': self.SINK_NAME, 'filter': self.FILTER, @@ -325,7 +325,7 @@ def test_sink_create_ok(self): self.assertEqual(conn._called_with['data'], SENT) def test_sink_get_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound conn = _Connection() api = self._makeOne(conn) @@ -353,7 +353,7 @@ def test_sink_get_hit(self): self.assertEqual(conn._called_with['path'], path) def test_sink_update_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound SENT = { 'name': self.SINK_NAME, 'filter': self.FILTER, @@ -390,7 +390,7 @@ def test_sink_update_hit(self): self.assertEqual(conn._called_with['data'], SENT) def test_sink_delete_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound conn = _Connection() api = self._makeOne(conn) @@ -422,7 +422,7 @@ class Test_MetricsAPI(unittest.TestCase): DESCRIPTION = 'DESCRIPTION' def _getTargetClass(self): - from gcloud.logging.connection import _MetricsAPI + from google.cloud.logging.connection import _MetricsAPI return _MetricsAPI def _makeOne(self, *args, **kw): @@ -474,7 +474,7 @@ def test_list_metrics_w_paging(self): {'pageSize': PAGE_SIZE, 'pageToken': TOKEN}) def test_metric_create_conflict(self): - from gcloud.exceptions import Conflict + from google.cloud.exceptions import Conflict SENT = { 'name': self.METRIC_NAME, 'filter': self.FILTER, @@ -512,7 +512,7 @@ def test_metric_create_ok(self): self.assertEqual(conn._called_with['data'], SENT) def test_metric_get_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound conn = _Connection() api = self._makeOne(conn) @@ -540,7 +540,7 @@ def test_metric_get_hit(self): self.assertEqual(conn._called_with['path'], path) def test_metric_update_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound SENT = { 'name': self.METRIC_NAME, 'filter': self.FILTER, @@ -577,7 +577,7 @@ def test_metric_update_hit(self): self.assertEqual(conn._called_with['data'], SENT) def test_metric_delete_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound conn = _Connection() api = self._makeOne(conn) @@ -621,8 +621,8 @@ def __init__(self, *responses): self._responses = responses def api_request(self, **kw): - from gcloud.exceptions import Conflict - from gcloud.exceptions import NotFound + from google.cloud.exceptions import Conflict + from google.cloud.exceptions import NotFound self._called_with = kw if self._raise_conflict: raise Conflict('oops') @@ -634,6 +634,6 @@ def api_request(self, **kw): def _datetime_to_rfc3339_w_nanos(value): - from gcloud._helpers import _RFC3339_NO_FRACTION + from google.cloud._helpers import _RFC3339_NO_FRACTION no_fraction = value.strftime(_RFC3339_NO_FRACTION) return '%s.%09dZ' % (no_fraction, value.microsecond * 1000) diff --git a/unit_tests/logging/test_entries.py b/unit_tests/logging/test_entries.py index 55e2a0ab8286..350a92f2ab7b 100644 --- a/unit_tests/logging/test_entries.py +++ b/unit_tests/logging/test_entries.py @@ -18,7 +18,7 @@ class Test_logger_name_from_path(unittest.TestCase): def _callFUT(self, path): - from gcloud.logging.entries import logger_name_from_path + from google.cloud.logging.entries import logger_name_from_path return logger_name_from_path(path) def test_w_simple_name(self): @@ -42,7 +42,7 @@ class Test_BaseEntry(unittest.TestCase): LOGGER_NAME = 'LOGGER_NAME' def _getTargetClass(self): - from gcloud.logging.entries import _BaseEntry + from google.cloud.logging.entries import _BaseEntry class _Dummy(_BaseEntry): _PAYLOAD_KEY = 'dummyPayload' @@ -118,7 +118,7 @@ def test_from_api_repr_missing_data_no_loggers(self): def test_from_api_repr_w_loggers_no_logger_match(self): from datetime import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC klass = self._getTargetClass() client = _Client(self.PROJECT) PAYLOAD = 'PAYLOAD' @@ -162,7 +162,7 @@ def test_from_api_repr_w_loggers_no_logger_match(self): def test_from_api_repr_w_loggers_w_logger_match(self): from datetime import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC client = _Client(self.PROJECT) PAYLOAD = 'PAYLOAD' IID = 'IID' @@ -194,7 +194,7 @@ class TestProtobufEntry(unittest.TestCase): LOGGER_NAME = 'LOGGER_NAME' def _getTargetClass(self): - from gcloud.logging.entries import ProtobufEntry + from google.cloud.logging.entries import ProtobufEntry return ProtobufEntry def _makeOne(self, *args, **kw): @@ -214,7 +214,7 @@ def test_parse_message(self): def _datetime_to_rfc3339_w_nanos(value): - from gcloud._helpers import _RFC3339_NO_FRACTION + from google.cloud._helpers import _RFC3339_NO_FRACTION no_fraction = value.strftime(_RFC3339_NO_FRACTION) return '%s.%09dZ' % (no_fraction, value.microsecond * 1000) diff --git a/unit_tests/logging/test_logger.py b/unit_tests/logging/test_logger.py index 199b81d8108a..3e3c3e25a8ad 100644 --- a/unit_tests/logging/test_logger.py +++ b/unit_tests/logging/test_logger.py @@ -21,7 +21,7 @@ class TestLogger(unittest.TestCase): LOGGER_NAME = 'logger-name' def _getTargetClass(self): - from gcloud.logging.logger import Logger + from google.cloud.logging.logger import Logger return Logger def _makeOne(self, *args, **kw): @@ -55,7 +55,7 @@ def test_ctor_explicit(self): self.assertEqual(logger.labels, LABELS) def test_batch_w_bound_client(self): - from gcloud.logging.logger import Batch + from google.cloud.logging.logger import Batch conn = object() client = _Client(self.PROJECT, conn) logger = self._makeOne(self.LOGGER_NAME, client=client) @@ -65,7 +65,7 @@ def test_batch_w_bound_client(self): self.assertTrue(batch.client is client) def test_batch_w_alternate_client(self): - from gcloud.logging.logger import Batch + from google.cloud.logging.logger import Batch conn1 = object() conn2 = object() client1 = _Client(self.PROJECT, conn1) @@ -364,7 +364,7 @@ def test_list_entries_defaults(self): self.assertEqual(client._listed, LISTED) def test_list_entries_explicit(self): - from gcloud.logging import DESCENDING + from google.cloud.logging.client import DESCENDING PROJECT1 = 'PROJECT1' PROJECT2 = 'PROJECT2' FILTER = 'resource.type:global' @@ -393,7 +393,7 @@ class TestBatch(unittest.TestCase): PROJECT = 'test-project' def _getTargetClass(self): - from gcloud.logging.logger import Batch + from google.cloud.logging.logger import Batch return Batch def _makeOne(self, *args, **kwargs): @@ -544,7 +544,7 @@ def test_commit_w_alternate_client(self): import json from google.protobuf.json_format import MessageToJson from google.protobuf.struct_pb2 import Struct, Value - from gcloud.logging.logger import Logger + from google.cloud.logging.logger import Logger TEXT = 'This is the entry text' STRUCT = {'message': TEXT, 'weather': 'partly cloudy'} message = Struct(fields={'foo': Value(bool_value=True)}) @@ -588,7 +588,7 @@ def test_context_mgr_success(self): import json from google.protobuf.json_format import MessageToJson from google.protobuf.struct_pb2 import Struct, Value - from gcloud.logging.logger import Logger + from google.cloud.logging.logger import Logger TEXT = 'This is the entry text' STRUCT = {'message': TEXT, 'weather': 'partly cloudy'} message = Struct(fields={'foo': Value(bool_value=True)}) diff --git a/unit_tests/logging/test_metric.py b/unit_tests/logging/test_metric.py index 6a9eca2ffc11..e4e93279b280 100644 --- a/unit_tests/logging/test_metric.py +++ b/unit_tests/logging/test_metric.py @@ -23,7 +23,7 @@ class TestMetric(unittest.TestCase): DESCRIPTION = 'DESCRIPTION' def _getTargetClass(self): - from gcloud.logging.metric import Metric + from google.cloud.logging.metric import Metric return Metric def _makeOne(self, *args, **kw): @@ -236,7 +236,7 @@ def metric_create(self, project, metric_name, filter_, description): project, metric_name, filter_, description) def metric_get(self, project, metric_name): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._metric_get_called_with = (project, metric_name) try: return self._metric_get_response diff --git a/unit_tests/logging/test_sink.py b/unit_tests/logging/test_sink.py index d7c4c6edf5f8..6d1989845517 100644 --- a/unit_tests/logging/test_sink.py +++ b/unit_tests/logging/test_sink.py @@ -23,7 +23,7 @@ class TestSink(unittest.TestCase): DESTINATION_URI = 'faux.googleapis.com/destination' def _getTargetClass(self): - from gcloud.logging.sink import Sink + from google.cloud.logging.sink import Sink return Sink def _makeOne(self, *args, **kw): @@ -247,7 +247,7 @@ def sink_create(self, project, sink_name, filter_, destination): project, sink_name, filter_, destination) def sink_get(self, project, sink_name): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._sink_get_called_with = (project, sink_name) try: return self._sink_get_response diff --git a/unit_tests/monitoring/test__dataframe.py b/unit_tests/monitoring/test__dataframe.py index 155f4122f53f..3e9fd31d111e 100644 --- a/unit_tests/monitoring/test__dataframe.py +++ b/unit_tests/monitoring/test__dataframe.py @@ -54,16 +54,16 @@ def parse_timestamps(): # pragma: NO COVER import datetime - from gcloud._helpers import _RFC3339_MICROS + from google.cloud._helpers import _RFC3339_MICROS return [datetime.datetime.strptime(t, _RFC3339_MICROS) for t in TIMESTAMPS] def generate_query_results(): # pragma: NO COVER - from gcloud.monitoring.metric import Metric - from gcloud.monitoring.resource import Resource - from gcloud.monitoring.timeseries import Point - from gcloud.monitoring.timeseries import TimeSeries + from google.cloud.monitoring.metric import Metric + from google.cloud.monitoring.resource import Resource + from google.cloud.monitoring.timeseries import Point + from google.cloud.monitoring.timeseries import TimeSeries def P(timestamp, value): return Point( @@ -87,7 +87,7 @@ def P(timestamp, value): class Test__build_dataframe(unittest.TestCase): # pragma: NO COVER def _callFUT(self, *args, **kwargs): - from gcloud.monitoring._dataframe import _build_dataframe + from google.cloud.monitoring._dataframe import _build_dataframe return _build_dataframe(*args, **kwargs) def test_both_label_and_labels_illegal(self): @@ -208,19 +208,19 @@ def test_empty_table_smart_labels(self): class Test__sorted_resource_labels(unittest.TestCase): def _callFUT(self, labels): - from gcloud.monitoring._dataframe import _sorted_resource_labels + from google.cloud.monitoring._dataframe import _sorted_resource_labels return _sorted_resource_labels(labels) def test_empty(self): self.assertEqual(self._callFUT([]), []) def test_sorted(self): - from gcloud.monitoring._dataframe import TOP_RESOURCE_LABELS + from google.cloud.monitoring._dataframe import TOP_RESOURCE_LABELS EXPECTED = TOP_RESOURCE_LABELS + ('other-1', 'other-2') self.assertSequenceEqual(self._callFUT(EXPECTED), EXPECTED) def test_reversed(self): - from gcloud.monitoring._dataframe import TOP_RESOURCE_LABELS + from google.cloud.monitoring._dataframe import TOP_RESOURCE_LABELS EXPECTED = TOP_RESOURCE_LABELS + ('other-1', 'other-2') INPUT = list(reversed(EXPECTED)) self.assertSequenceEqual(self._callFUT(INPUT), EXPECTED) diff --git a/unit_tests/monitoring/test_client.py b/unit_tests/monitoring/test_client.py index 17edcd1fef0a..62487b137f19 100644 --- a/unit_tests/monitoring/test_client.py +++ b/unit_tests/monitoring/test_client.py @@ -20,7 +20,7 @@ class TestClient(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.client import Client + from google.cloud.monitoring.client import Client return Client def _makeOne(self, *args, **kwargs): @@ -28,8 +28,8 @@ def _makeOne(self, *args, **kwargs): def test_query(self): import datetime - from gcloud._helpers import _datetime_to_rfc3339 - from gcloud.exceptions import NotFound + from google.cloud._helpers import _datetime_to_rfc3339 + from google.cloud.exceptions import NotFound START_TIME = datetime.datetime(2016, 4, 6, 22, 5, 0) END_TIME = datetime.datetime(2016, 4, 6, 22, 10, 0) @@ -185,7 +185,7 @@ def test_resource_factory(self): def test_timeseries_factory_gauge(self): import datetime from unit_tests._testing import _Monkey - import gcloud.monitoring.client + import google.cloud.monitoring.client METRIC_TYPE = 'custom.googleapis.com/my_metric' METRIC_LABELS = { 'status': 'successful' @@ -218,7 +218,7 @@ def test_timeseries_factory_gauge(self): TIME2 = datetime.datetime.utcnow() # Construct a time series assuming a gauge metric using the current # time - with _Monkey(gcloud.monitoring.client, _UTCNOW=lambda: TIME2): + with _Monkey(google.cloud.monitoring.client, _UTCNOW=lambda: TIME2): timeseries_no_end = client.time_series(metric, resource, VALUE) self.assertEqual(timeseries_no_end.points[0].end_time, TIME2) @@ -562,7 +562,7 @@ def __init__(self, *responses): self._requested = [] def api_request(self, **kwargs): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._requested.append(kwargs) try: return self._responses.pop(0) diff --git a/unit_tests/monitoring/test_connection.py b/unit_tests/monitoring/test_connection.py index 681d677d1973..3001f997b2c1 100644 --- a/unit_tests/monitoring/test_connection.py +++ b/unit_tests/monitoring/test_connection.py @@ -18,7 +18,7 @@ class TestConnection(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.connection import Connection + from google.cloud.monitoring.connection import Connection return Connection def _makeOne(self, *args, **kwargs): diff --git a/unit_tests/monitoring/test_group.py b/unit_tests/monitoring/test_group.py index c5dbcf4fb6d6..aa02adf75ee1 100644 --- a/unit_tests/monitoring/test_group.py +++ b/unit_tests/monitoring/test_group.py @@ -18,7 +18,7 @@ class Test_group_id_from_name(unittest.TestCase): def _callFUT(self, path, project): - from gcloud.monitoring.group import _group_id_from_name + from google.cloud.monitoring.group import _group_id_from_name return _group_id_from_name(path, project) def test_w_empty_name(self): @@ -86,7 +86,7 @@ def setUp(self): } def _setUpResources(self): - from gcloud.monitoring.resource import Resource + from google.cloud.monitoring.resource import Resource info1 = { 'type': 'gce_instance', 'labels': { @@ -108,7 +108,7 @@ def _setUpResources(self): self.MEMBERS = [info1, info2] def _getTargetClass(self): - from gcloud.monitoring.group import Group + from google.cloud.monitoring.group import Group return Group def _makeOne(self, *args, **kwargs): @@ -350,7 +350,7 @@ def test_list(self): self.assertEqual(request, expected_request) def test_list_paged(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound LIST_OF_GROUPS = [self.JSON_GROUP, self.JSON_PARENT] TOKEN = 'second-page-please' @@ -483,7 +483,7 @@ def test_list_members_paged(self): def test_list_members_w_all_arguments(self): import datetime - from gcloud._helpers import _datetime_to_rfc3339 + from google.cloud._helpers import _datetime_to_rfc3339 self._setUpResources() @@ -532,7 +532,7 @@ def __init__(self, *responses): self._requested = [] def api_request(self, **kwargs): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._requested.append(kwargs) try: return self._responses.pop(0) diff --git a/unit_tests/monitoring/test_label.py b/unit_tests/monitoring/test_label.py index 6161d2d7cd7c..8bfe6e8c4e49 100644 --- a/unit_tests/monitoring/test_label.py +++ b/unit_tests/monitoring/test_label.py @@ -18,7 +18,7 @@ class TestLabelValueType(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.label import LabelValueType + from google.cloud.monitoring.label import LabelValueType return LabelValueType def test_one(self): @@ -33,7 +33,7 @@ def test_names(self): class TestLabelDescriptor(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.label import LabelDescriptor + from google.cloud.monitoring.label import LabelDescriptor return LabelDescriptor def _makeOne(self, *args, **kwargs): diff --git a/unit_tests/monitoring/test_metric.py b/unit_tests/monitoring/test_metric.py index 238c5244d0f5..07e73b52c980 100644 --- a/unit_tests/monitoring/test_metric.py +++ b/unit_tests/monitoring/test_metric.py @@ -18,7 +18,7 @@ class TestMetricKind(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.metric import MetricKind + from google.cloud.monitoring.metric import MetricKind return MetricKind def test_one(self): @@ -33,7 +33,7 @@ def test_names(self): class TestValueType(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.metric import ValueType + from google.cloud.monitoring.metric import ValueType return ValueType def test_one(self): @@ -48,14 +48,14 @@ def test_names(self): class TestMetricDescriptor(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.metric import MetricDescriptor + from google.cloud.monitoring.metric import MetricDescriptor return MetricDescriptor def _makeOne(self, *args, **kwargs): return self._getTargetClass()(*args, **kwargs) def test_constructor(self): - from gcloud.monitoring.label import LabelDescriptor + from google.cloud.monitoring.label import LabelDescriptor TYPE = 'appengine.googleapis.com/http/server/response_count' NAME = 'projects/my-project/metricDescriptors/' + TYPE @@ -384,7 +384,7 @@ def test_list(self): self.assertEqual(request, expected_request) def test_list_paged(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound PROJECT = 'my-project' PATH = 'projects/{project}/metricDescriptors/'.format(project=PROJECT) @@ -493,7 +493,7 @@ def test_list_filtered_by_type_prefix(self): class TestMetric(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.metric import Metric + from google.cloud.monitoring.metric import Metric return Metric def _makeOne(self, *args, **kwargs): @@ -538,7 +538,7 @@ def __init__(self, *responses): self._requested = [] def api_request(self, **kwargs): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._requested.append(kwargs) try: return self._responses.pop(0) diff --git a/unit_tests/monitoring/test_query.py b/unit_tests/monitoring/test_query.py index 3cf8d6cc3096..0b1a44370baa 100644 --- a/unit_tests/monitoring/test_query.py +++ b/unit_tests/monitoring/test_query.py @@ -43,7 +43,7 @@ class TestAligner(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.query import Aligner + from google.cloud.monitoring.query import Aligner return Aligner def test_one(self): @@ -58,7 +58,7 @@ def test_names(self): class TestReducer(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.query import Reducer + from google.cloud.monitoring.query import Reducer return Reducer def test_one(self): @@ -74,7 +74,7 @@ def test_names(self): class TestQuery(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.query import Query + from google.cloud.monitoring.query import Query return Query def _makeOne(self, *args, **kwargs): @@ -82,7 +82,7 @@ def _makeOne(self, *args, **kwargs): @staticmethod def _make_timestamp(value): - from gcloud._helpers import _datetime_to_rfc3339 + from google.cloud._helpers import _datetime_to_rfc3339 return _datetime_to_rfc3339(value) def test_constructor_minimal(self): @@ -127,7 +127,7 @@ def test_constructor_maximal(self): def test_constructor_default_end_time(self): import datetime from unit_tests._testing import _Monkey - from gcloud.monitoring import query as MUT + from google.cloud.monitoring import query as MUT MINUTES = 5 NOW, T0, T1 = [ @@ -334,7 +334,7 @@ def test_iteration(self): def test_iteration_paged(self): import copy import datetime - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound T0 = datetime.datetime(2016, 4, 6, 22, 5, 0) T1 = datetime.datetime(2016, 4, 6, 22, 10, 0) @@ -500,7 +500,7 @@ def test_iteration_headers_only(self): class Test_Filter(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.query import _Filter + from google.cloud.monitoring.query import _Filter return _Filter def _makeOne(self, metric_type): @@ -534,7 +534,7 @@ def test_maximal(self): class Test__build_label_filter(unittest.TestCase): def _callFUT(self, *args, **kwargs): - from gcloud.monitoring.query import _build_label_filter + from google.cloud.monitoring.query import _build_label_filter return _build_label_filter(*args, **kwargs) def test_no_labels(self): @@ -630,7 +630,7 @@ def __init__(self, *responses): self._requested = [] def api_request(self, **kwargs): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._requested.append(kwargs) try: return self._responses.pop(0) diff --git a/unit_tests/monitoring/test_resource.py b/unit_tests/monitoring/test_resource.py index 26d1fc1a158b..d4f8c6b461b5 100644 --- a/unit_tests/monitoring/test_resource.py +++ b/unit_tests/monitoring/test_resource.py @@ -18,14 +18,14 @@ class TestResourceDescriptor(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.resource import ResourceDescriptor + from google.cloud.monitoring.resource import ResourceDescriptor return ResourceDescriptor def _makeOne(self, *args, **kwargs): return self._getTargetClass()(*args, **kwargs) def test_constructor(self): - from gcloud.monitoring.label import LabelDescriptor + from google.cloud.monitoring.label import LabelDescriptor TYPE = 'gce_instance' NAME = 'projects/my-project/monitoredResourceDescriptors/' + TYPE @@ -192,7 +192,7 @@ def test_list(self): self.assertEqual(request, expected_request) def test_list_paged(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound PROJECT = 'my-project' PATH = 'projects/{project}/monitoredResourceDescriptors/'.format( @@ -277,7 +277,7 @@ def test_list_filtered(self): class TestResource(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.resource import Resource + from google.cloud.monitoring.resource import Resource return Resource def _makeOne(self, *args, **kwargs): @@ -324,7 +324,7 @@ def __init__(self, *responses): self._requested = [] def api_request(self, **kwargs): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._requested.append(kwargs) try: return self._responses.pop(0) diff --git a/unit_tests/monitoring/test_timeseries.py b/unit_tests/monitoring/test_timeseries.py index 6022e7992e58..eff705255c8d 100644 --- a/unit_tests/monitoring/test_timeseries.py +++ b/unit_tests/monitoring/test_timeseries.py @@ -35,16 +35,16 @@ class TestTimeSeries(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.timeseries import TimeSeries + from google.cloud.monitoring.timeseries import TimeSeries return TimeSeries def _makeOne(self, *args, **kwargs): return self._getTargetClass()(*args, **kwargs) def test_constructor(self): - from gcloud.monitoring.metric import Metric - from gcloud.monitoring.resource import Resource - from gcloud.monitoring.timeseries import Point + from google.cloud.monitoring.metric import Metric + from google.cloud.monitoring.resource import Resource + from google.cloud.monitoring.timeseries import Point VALUE = 60 # seconds @@ -151,7 +151,7 @@ def test_labels(self): class TestPoint(unittest.TestCase): def _getTargetClass(self): - from gcloud.monitoring.timeseries import Point + from google.cloud.monitoring.timeseries import Point return Point def _makeOne(self, *args, **kwargs): diff --git a/unit_tests/pubsub/test__gax.py b/unit_tests/pubsub/test__gax.py index 9908331768a7..babe78e0cf84 100644 --- a/unit_tests/pubsub/test__gax.py +++ b/unit_tests/pubsub/test__gax.py @@ -17,7 +17,7 @@ try: # pylint: disable=unused-import - import gcloud.pubsub._gax + import google.cloud.pubsub._gax # pylint: enable=unused-import except ImportError: # pragma: NO COVER _HAVE_GAX = False @@ -45,7 +45,7 @@ def _makeOne(self, *args, **kw): class Test_PublisherAPI(_Base, unittest.TestCase): def _getTargetClass(self): - from gcloud.pubsub._gax import _PublisherAPI + from google.cloud.pubsub._gax import _PublisherAPI return _PublisherAPI def test_ctor(self): @@ -111,7 +111,7 @@ def test_topic_create(self): self.assertEqual(options, None) def test_topic_create_already_exists(self): - from gcloud.exceptions import Conflict + from google.cloud.exceptions import Conflict gax_api = _GAXPublisherAPI(_create_topic_conflict=True) api = self._makeOne(gax_api) @@ -147,7 +147,7 @@ def test_topic_get_hit(self): self.assertEqual(options, None) def test_topic_get_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound gax_api = _GAXPublisherAPI() api = self._makeOne(gax_api) @@ -181,7 +181,7 @@ def test_topic_delete_hit(self): self.assertEqual(options, None) def test_topic_delete_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound gax_api = _GAXPublisherAPI(_delete_topic_ok=False) api = self._makeOne(gax_api) @@ -226,7 +226,7 @@ def test_topic_publish_hit(self): def test_topic_publish_miss_w_attrs_w_bytes_payload(self): import base64 - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound PAYLOAD = b'This is the message text' B64 = base64.b64encode(PAYLOAD) MESSAGE = {'data': B64, 'attributes': {'foo': 'bar'}} @@ -314,7 +314,7 @@ def test_topic_list_subscriptions_with_paging(self): def test_topic_list_subscriptions_miss(self): from google.gax import INITIAL_PAGE - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound gax_api = _GAXPublisherAPI() api = self._makeOne(gax_api) @@ -349,7 +349,7 @@ class Test_SubscriberAPI(_Base, unittest.TestCase): PUSH_ENDPOINT = 'https://api.example.com/push' def _getTargetClass(self): - from gcloud.pubsub._gax import _SubscriberAPI + from google.cloud.pubsub._gax import _SubscriberAPI return _SubscriberAPI def test_ctor(self): @@ -432,7 +432,7 @@ def test_subscription_create(self): self.assertEqual(options, None) def test_subscription_create_already_exists(self): - from gcloud.exceptions import Conflict + from google.cloud.exceptions import Conflict DEADLINE = 600 gax_api = _GAXSubscriberAPI(_create_subscription_conflict=True) api = self._makeOne(gax_api) @@ -487,7 +487,7 @@ def test_subscription_get_hit(self): self.assertEqual(options, None) def test_subscription_get_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound gax_api = _GAXSubscriberAPI() api = self._makeOne(gax_api) @@ -521,7 +521,7 @@ def test_subscription_delete_hit(self): self.assertEqual(options, None) def test_subscription_delete_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound gax_api = _GAXSubscriberAPI(_delete_subscription_ok=False) api = self._makeOne(gax_api) @@ -556,7 +556,7 @@ def test_subscription_modify_push_config_hit(self): self.assertEqual(options, None) def test_subscription_modify_push_config_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound gax_api = _GAXSubscriberAPI() api = self._makeOne(gax_api) @@ -609,7 +609,7 @@ def test_subscription_pull_explicit(self): self.assertEqual(options, None) def test_subscription_pull_defaults_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound gax_api = _GAXSubscriberAPI() api = self._makeOne(gax_api) @@ -652,7 +652,7 @@ def test_subscription_acknowledge_hit(self): self.assertEqual(options, None) def test_subscription_acknowledge_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound ACK_ID1 = 'DEADBEEF' ACK_ID2 = 'BEADCAFE' gax_api = _GAXSubscriberAPI() @@ -699,7 +699,7 @@ def test_subscription_modify_ack_deadline_hit(self): self.assertEqual(options, None) def test_subscription_modify_ack_deadline_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound ACK_ID1 = 'DEADBEEF' ACK_ID2 = 'BEADCAFE' NEW_DEADLINE = 90 diff --git a/unit_tests/pubsub/test__helpers.py b/unit_tests/pubsub/test__helpers.py index a701f9a713dc..646a73d978c0 100644 --- a/unit_tests/pubsub/test__helpers.py +++ b/unit_tests/pubsub/test__helpers.py @@ -18,7 +18,7 @@ class Test_topic_name_from_path(unittest.TestCase): def _callFUT(self, path, project): - from gcloud.pubsub._helpers import topic_name_from_path + from google.cloud.pubsub._helpers import topic_name_from_path return topic_name_from_path(path, project) def test_w_simple_name(self): @@ -39,7 +39,7 @@ def test_w_name_w_all_extras(self): class Test_subscription_name_from_path(unittest.TestCase): def _callFUT(self, path, project): - from gcloud.pubsub._helpers import subscription_name_from_path + from google.cloud.pubsub._helpers import subscription_name_from_path return subscription_name_from_path(path, project) def test_w_simple_name(self): diff --git a/unit_tests/pubsub/test_client.py b/unit_tests/pubsub/test_client.py index 3b3a95ff6175..810ac406f858 100644 --- a/unit_tests/pubsub/test_client.py +++ b/unit_tests/pubsub/test_client.py @@ -23,15 +23,15 @@ class TestClient(unittest.TestCase): SUB_PATH = 'projects/%s/subscriptions/%s' % (PROJECT, SUB_NAME) def _getTargetClass(self): - from gcloud.pubsub.client import Client + from google.cloud.pubsub.client import Client return Client def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) def test_publisher_api_wo_gax(self): - from gcloud.pubsub.connection import _PublisherAPI - from gcloud.pubsub import client as MUT + from google.cloud.pubsub.connection import _PublisherAPI + from google.cloud.pubsub import client as MUT from unit_tests._testing import _Monkey creds = _Credentials() client = self._makeOne(project=self.PROJECT, credentials=creds) @@ -47,7 +47,7 @@ def test_publisher_api_wo_gax(self): self.assertTrue(again is api) def test_publisher_api_w_gax(self): - from gcloud.pubsub import client as MUT + from google.cloud.pubsub import client as MUT from unit_tests._testing import _Monkey wrapped = object() @@ -78,8 +78,8 @@ def __init__(self, _wrapped): self.assertTrue(again is api) def test_subscriber_api_wo_gax(self): - from gcloud.pubsub.connection import _SubscriberAPI - from gcloud.pubsub import client as MUT + from google.cloud.pubsub.connection import _SubscriberAPI + from google.cloud.pubsub import client as MUT from unit_tests._testing import _Monkey creds = _Credentials() client = self._makeOne(project=self.PROJECT, credentials=creds) @@ -95,7 +95,7 @@ def test_subscriber_api_wo_gax(self): self.assertTrue(again is api) def test_subscriber_api_w_gax(self): - from gcloud.pubsub import client as MUT + from google.cloud.pubsub import client as MUT from unit_tests._testing import _Monkey wrapped = object() @@ -126,7 +126,7 @@ def __init__(self, _wrapped): self.assertTrue(again is api) def test_iam_policy_api(self): - from gcloud.pubsub.connection import _IAMPolicyAPI + from google.cloud.pubsub.connection import _IAMPolicyAPI creds = _Credentials() client = self._makeOne(project=self.PROJECT, credentials=creds) conn = client.connection = object() @@ -138,7 +138,7 @@ def test_iam_policy_api(self): self.assertTrue(again is api) def test_list_topics_no_paging(self): - from gcloud.pubsub.topic import Topic + from google.cloud.pubsub.topic import Topic creds = _Credentials() client = self._makeOne(project=self.PROJECT, credentials=creds) client.connection = object() @@ -155,7 +155,7 @@ def test_list_topics_no_paging(self): self.assertEqual(api._listed_topics, (self.PROJECT, None, None)) def test_list_topics_with_paging(self): - from gcloud.pubsub.topic import Topic + from google.cloud.pubsub.topic import Topic TOKEN1 = 'TOKEN1' TOKEN2 = 'TOKEN2' SIZE = 1 @@ -189,7 +189,7 @@ def test_list_topics_missing_key(self): self.assertEqual(api._listed_topics, (self.PROJECT, None, None)) def test_list_subscriptions_no_paging(self): - from gcloud.pubsub.subscription import Subscription + from google.cloud.pubsub.subscription import Subscription SUB_INFO = {'name': self.SUB_PATH, 'topic': self.TOPIC_PATH} creds = _Credentials() client = self._makeOne(project=self.PROJECT, credentials=creds) @@ -209,7 +209,7 @@ def test_list_subscriptions_no_paging(self): (self.PROJECT, None, None)) def test_list_subscriptions_with_paging(self): - from gcloud.pubsub.subscription import Subscription + from google.cloud.pubsub.subscription import Subscription SUB_INFO = {'name': self.SUB_PATH, 'topic': self.TOPIC_PATH} creds = _Credentials() client = self._makeOne(project=self.PROJECT, credentials=creds) diff --git a/unit_tests/pubsub/test_connection.py b/unit_tests/pubsub/test_connection.py index 8d356f46c37f..0e8cedfadf40 100644 --- a/unit_tests/pubsub/test_connection.py +++ b/unit_tests/pubsub/test_connection.py @@ -32,7 +32,7 @@ def _makeOne(self, *args, **kw): class TestConnection(_Base): def _getTargetClass(self): - from gcloud.pubsub.connection import Connection + from google.cloud.pubsub.connection import Connection return Connection def test_default_url(self): @@ -43,7 +43,7 @@ def test_default_url(self): def test_custom_url_from_env(self): import os from unit_tests._testing import _Monkey - from gcloud.environment_vars import PUBSUB_EMULATOR + from google.cloud.environment_vars import PUBSUB_EMULATOR HOST = 'localhost:8187' fake_environ = {PUBSUB_EMULATOR: HOST} @@ -66,7 +66,7 @@ def test_custom_url_from_constructor(self): def test_custom_url_constructor_and_env(self): import os from unit_tests._testing import _Monkey - from gcloud.environment_vars import PUBSUB_EMULATOR + from google.cloud.environment_vars import PUBSUB_EMULATOR HOST1 = object() HOST2 = object() @@ -117,7 +117,7 @@ def test_build_api_url_w_base_url_override(self): class Test_PublisherAPI(_Base): def _getTargetClass(self): - from gcloud.pubsub.connection import _PublisherAPI + from google.cloud.pubsub.connection import _PublisherAPI return _PublisherAPI def _makeOne(self, *args, **kw): @@ -200,7 +200,7 @@ def test_topic_create(self): self.assertEqual(connection._called_with['path'], path) def test_topic_create_already_exists(self): - from gcloud.exceptions import Conflict + from google.cloud.exceptions import Conflict connection = _Connection() connection._no_response_error = Conflict api = self._makeOne(connection) @@ -225,7 +225,7 @@ def test_topic_get_hit(self): self.assertEqual(connection._called_with['path'], path) def test_topic_get_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound connection = _Connection() api = self._makeOne(connection) @@ -248,7 +248,7 @@ def test_topic_delete_hit(self): self.assertEqual(connection._called_with['path'], path) def test_topic_delete_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound connection = _Connection() api = self._makeOne(connection) @@ -280,7 +280,7 @@ def test_topic_publish_hit(self): def test_topic_publish_miss(self): import base64 - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound PAYLOAD = b'This is the message text' B64 = base64.b64encode(PAYLOAD).decode('ascii') MESSAGE = {'data': B64, 'attributes': {}} @@ -362,7 +362,7 @@ def test_topic_list_subscriptions_missing_key(self): self.assertEqual(connection._called_with['query_params'], {}) def test_topic_list_subscriptions_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound connection = _Connection() api = self._makeOne(connection) @@ -378,7 +378,7 @@ def test_topic_list_subscriptions_miss(self): class Test_SubscriberAPI(_Base): def _getTargetClass(self): - from gcloud.pubsub.connection import _SubscriberAPI + from google.cloud.pubsub.connection import _SubscriberAPI return _SubscriberAPI def _makeOne(self, *args, **kw): @@ -631,7 +631,7 @@ def test_subscription_modify_ack_deadline(self): class Test_IAMPolicyAPI(_Base): def _getTargetClass(self): - from gcloud.pubsub.connection import _IAMPolicyAPI + from google.cloud.pubsub.connection import _IAMPolicyAPI return _IAMPolicyAPI def test_ctor(self): @@ -640,7 +640,10 @@ def test_ctor(self): self.assertTrue(api._connection is connection) def test_get_iam_policy(self): - from gcloud.pubsub.iam import OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE + from google.cloud.pubsub.iam import OWNER_ROLE + from google.cloud.pubsub.iam import EDITOR_ROLE + from google.cloud.pubsub.iam import VIEWER_ROLE + OWNER1 = 'user:phred@example.com' OWNER2 = 'group:cloud-logs@google.com' EDITOR1 = 'domain:google.com' @@ -667,7 +670,10 @@ def test_get_iam_policy(self): self.assertEqual(connection._called_with['path'], path) def test_set_iam_policy(self): - from gcloud.pubsub.iam import OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE + from google.cloud.pubsub.iam import OWNER_ROLE + from google.cloud.pubsub.iam import EDITOR_ROLE + from google.cloud.pubsub.iam import VIEWER_ROLE + OWNER1 = 'user:phred@example.com' OWNER2 = 'group:cloud-logs@google.com' EDITOR1 = 'domain:google.com' @@ -697,7 +703,10 @@ def test_set_iam_policy(self): {'policy': POLICY}) def test_test_iam_permissions(self): - from gcloud.pubsub.iam import OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE + from google.cloud.pubsub.iam import OWNER_ROLE + from google.cloud.pubsub.iam import EDITOR_ROLE + from google.cloud.pubsub.iam import VIEWER_ROLE + ALL_ROLES = [OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE] ALLOWED = ALL_ROLES[1:] RETURNED = {'permissions': ALLOWED} @@ -714,7 +723,10 @@ def test_test_iam_permissions(self): {'permissions': ALL_ROLES}) def test_test_iam_permissions_missing_key(self): - from gcloud.pubsub.iam import OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE + from google.cloud.pubsub.iam import OWNER_ROLE + from google.cloud.pubsub.iam import EDITOR_ROLE + from google.cloud.pubsub.iam import VIEWER_ROLE + ALL_ROLES = [OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE] RETURNED = {} connection = _Connection(RETURNED) @@ -739,7 +751,7 @@ def __init__(self, *responses): self._responses = responses def api_request(self, **kw): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._called_with = kw try: response, self._responses = self._responses[0], self._responses[1:] diff --git a/unit_tests/pubsub/test_iam.py b/unit_tests/pubsub/test_iam.py index 859429938f11..d92cd641af04 100644 --- a/unit_tests/pubsub/test_iam.py +++ b/unit_tests/pubsub/test_iam.py @@ -18,7 +18,7 @@ class TestPolicy(unittest.TestCase): def _getTargetClass(self): - from gcloud.pubsub.iam import Policy + from google.cloud.pubsub.iam import Policy return Policy def _makeOne(self, *args, **kw): @@ -91,7 +91,7 @@ def test_from_api_repr_only_etag(self): self.assertEqual(list(policy.viewers), []) def test_from_api_repr_complete(self): - from gcloud.pubsub.iam import ( + from google.cloud.pubsub.iam import ( OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE, @@ -150,7 +150,7 @@ def test_to_api_repr_only_etag(self): self.assertEqual(policy.to_api_repr(), {'etag': 'DEADBEEF'}) def test_to_api_repr_full(self): - from gcloud.pubsub.iam import ( + from google.cloud.pubsub.iam import ( PUBSUB_ADMIN_ROLE, PUBSUB_EDITOR_ROLE, PUBSUB_VIEWER_ROLE, diff --git a/unit_tests/pubsub/test_message.py b/unit_tests/pubsub/test_message.py index 47ca960a2e5e..c9c798108116 100644 --- a/unit_tests/pubsub/test_message.py +++ b/unit_tests/pubsub/test_message.py @@ -18,7 +18,7 @@ class TestMessage(unittest.TestCase): def _getTargetClass(self): - from gcloud.pubsub.message import Message + from google.cloud.pubsub.message import Message return Message def _makeOne(self, *args, **kw): @@ -68,8 +68,8 @@ def _to_fail(): def test_timestamp_w_timestamp_in_attributes(self): from datetime import datetime - from gcloud._helpers import _RFC3339_MICROS - from gcloud._helpers import UTC + from google.cloud._helpers import _RFC3339_MICROS + from google.cloud._helpers import UTC DATA = b'DEADBEEF' MESSAGE_ID = b'12345' TIMESTAMP = '2015-04-10T18:42:27.131956Z' diff --git a/unit_tests/pubsub/test_subscription.py b/unit_tests/pubsub/test_subscription.py index b76636503aa9..3c5896056574 100644 --- a/unit_tests/pubsub/test_subscription.py +++ b/unit_tests/pubsub/test_subscription.py @@ -25,7 +25,7 @@ class TestSubscription(unittest.TestCase): ENDPOINT = 'https://api.example.com/push' def _getTargetClass(self): - from gcloud.pubsub.subscription import Subscription + from google.cloud.pubsub.subscription import Subscription return Subscription def _makeOne(self, *args, **kw): @@ -68,7 +68,7 @@ def test_ctor_w_neither_topic_nor_client(self): self._makeOne(self.SUB_NAME) def test_from_api_repr_no_topics(self): - from gcloud.pubsub.topic import Topic + from google.cloud.pubsub.topic import Topic resource = {'topic': self.TOPIC_PATH, 'name': self.SUB_PATH, 'ackDeadlineSeconds': self.DEADLINE, @@ -99,7 +99,7 @@ def test_from_api_repr_w_deleted_topic(self): self.assertEqual(subscription.push_endpoint, self.ENDPOINT) def test_from_api_repr_w_topics_no_topic_match(self): - from gcloud.pubsub.topic import Topic + from google.cloud.pubsub.topic import Topic resource = {'topic': self.TOPIC_PATH, 'name': self.SUB_PATH, 'ackDeadlineSeconds': self.DEADLINE, @@ -144,7 +144,7 @@ def test_full_name_and_path(self): self.assertEqual(subscription.path, SUB_PATH) def test_autoack_defaults(self): - from gcloud.pubsub.subscription import AutoAck + from google.cloud.pubsub.subscription import AutoAck client = _Client(project=self.PROJECT) topic = _Topic(self.TOPIC_NAME, client=client) subscription = self._makeOne(self.SUB_NAME, topic) @@ -156,7 +156,7 @@ def test_autoack_defaults(self): self.assertTrue(auto_ack._client is None) def test_autoack_explicit(self): - from gcloud.pubsub.subscription import AutoAck + from google.cloud.pubsub.subscription import AutoAck client1 = _Client(project=self.PROJECT) client2 = _Client(project=self.PROJECT) topic = _Topic(self.TOPIC_NAME, client=client1) @@ -323,7 +323,7 @@ def test_modify_push_config_wo_endpoint_w_alternate_client(self): def test_pull_wo_return_immediately_max_messages_w_bound_client(self): import base64 - from gcloud.pubsub.message import Message + from google.cloud.pubsub.message import Message ACK_ID = 'DEADBEEF' MSG_ID = 'BEADCAFE' PAYLOAD = b'This is the message text' @@ -350,7 +350,7 @@ def test_pull_wo_return_immediately_max_messages_w_bound_client(self): def test_pull_w_return_immediately_w_max_messages_w_alt_client(self): import base64 - from gcloud.pubsub.message import Message + from google.cloud.pubsub.message import Message ACK_ID = 'DEADBEEF' MSG_ID = 'BEADCAFE' PAYLOAD = b'This is the message text' @@ -450,7 +450,7 @@ def test_modify_ack_deadline_w_alternate_client(self): (self.SUB_PATH, [ACK_ID1, ACK_ID2], self.DEADLINE)) def test_get_iam_policy_w_bound_client(self): - from gcloud.pubsub.iam import ( + from google.cloud.pubsub.iam import ( PUBSUB_ADMIN_ROLE, PUBSUB_EDITOR_ROLE, PUBSUB_VIEWER_ROLE, @@ -515,8 +515,8 @@ def test_get_iam_policy_w_alternate_client(self): self.assertEqual(api._got_iam_policy, self.SUB_PATH) def test_set_iam_policy_w_bound_client(self): - from gcloud.pubsub.iam import Policy - from gcloud.pubsub.iam import ( + from google.cloud.pubsub.iam import Policy + from google.cloud.pubsub.iam import ( PUBSUB_ADMIN_ROLE, PUBSUB_EDITOR_ROLE, PUBSUB_VIEWER_ROLE, @@ -572,7 +572,7 @@ def test_set_iam_policy_w_bound_client(self): self.assertEqual(api._set_iam_policy, (self.SUB_PATH, POLICY)) def test_set_iam_policy_w_alternate_client(self): - from gcloud.pubsub.iam import Policy + from google.cloud.pubsub.iam import Policy RESPONSE = {'etag': 'ACAB'} client1 = _Client(project=self.PROJECT) client2 = _Client(project=self.PROJECT) @@ -592,7 +592,10 @@ def test_set_iam_policy_w_alternate_client(self): self.assertEqual(api._set_iam_policy, (self.SUB_PATH, {})) def test_check_iam_permissions_w_bound_client(self): - from gcloud.pubsub.iam import OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE + from google.cloud.pubsub.iam import OWNER_ROLE + from google.cloud.pubsub.iam import EDITOR_ROLE + from google.cloud.pubsub.iam import VIEWER_ROLE + ROLES = [VIEWER_ROLE, EDITOR_ROLE, OWNER_ROLE] client = _Client(project=self.PROJECT) api = client.iam_policy_api = _FauxIAMPolicy() @@ -607,7 +610,10 @@ def test_check_iam_permissions_w_bound_client(self): (self.SUB_PATH, ROLES)) def test_check_iam_permissions_w_alternate_client(self): - from gcloud.pubsub.iam import OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE + from google.cloud.pubsub.iam import OWNER_ROLE + from google.cloud.pubsub.iam import EDITOR_ROLE + from google.cloud.pubsub.iam import VIEWER_ROLE + ROLES = [VIEWER_ROLE, EDITOR_ROLE, OWNER_ROLE] client1 = _Client(project=self.PROJECT) client2 = _Client(project=self.PROJECT) @@ -632,7 +638,7 @@ def subscription_create(self, subscription_path, topic_path, return self._subscription_create_response def subscription_get(self, subscription_path): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._subscription_got = subscription_path try: return self._subscription_get_response @@ -669,7 +675,7 @@ def subscription_modify_ack_deadline(self, subscription_path, ack_ids, class TestAutoAck(unittest.TestCase): def _getTargetClass(self): - from gcloud.pubsub.subscription import AutoAck + from google.cloud.pubsub.subscription import AutoAck return AutoAck def _makeOne(self, *args, **kw): @@ -774,7 +780,7 @@ def __init__(self, project): self.project = project def topic(self, name, timestamp_messages=False): - from gcloud.pubsub.topic import Topic + from google.cloud.pubsub.topic import Topic return Topic(name, client=self, timestamp_messages=timestamp_messages) diff --git a/unit_tests/pubsub/test_topic.py b/unit_tests/pubsub/test_topic.py index b9fa94698cb6..67d2e0001b1b 100644 --- a/unit_tests/pubsub/test_topic.py +++ b/unit_tests/pubsub/test_topic.py @@ -21,7 +21,7 @@ class TestTopic(unittest.TestCase): TOPIC_PATH = 'projects/%s/topics/%s' % (PROJECT, TOPIC_NAME) def _getTargetClass(self): - from gcloud.pubsub.topic import Topic + from google.cloud.pubsub.topic import Topic return Topic def _makeOne(self, *args, **kw): @@ -138,8 +138,8 @@ def test_publish_single_bytes_wo_attrs_w_bound_client(self): def test_publish_single_bytes_wo_attrs_w_add_timestamp_alt_client(self): import base64 import datetime - from gcloud.pubsub import topic as MUT - from gcloud._helpers import _RFC3339_MICROS + from google.cloud.pubsub import topic as MUT + from google.cloud._helpers import _RFC3339_MICROS from unit_tests._testing import _Monkey NOW = datetime.datetime.utcnow() @@ -287,7 +287,7 @@ def test_publish_multiple_error(self): self.assertEqual(getattr(api, '_topic_published', self), self) def test_subscription(self): - from gcloud.pubsub.subscription import Subscription + from google.cloud.pubsub.subscription import Subscription client = _Client(project=self.PROJECT) topic = self._makeOne(self.TOPIC_NAME, client=client) @@ -298,7 +298,7 @@ def test_subscription(self): self.assertTrue(subscription.topic is topic) def test_list_subscriptions_no_paging(self): - from gcloud.pubsub.subscription import Subscription + from google.cloud.pubsub.subscription import Subscription SUB_NAME_1 = 'subscription_1' SUB_PATH_1 = 'projects/%s/subscriptions/%s' % ( self.PROJECT, SUB_NAME_1) @@ -332,7 +332,7 @@ def test_list_subscriptions_no_paging(self): (self.TOPIC_PATH, None, None)) def test_list_subscriptions_with_paging(self): - from gcloud.pubsub.subscription import Subscription + from google.cloud.pubsub.subscription import Subscription SUB_NAME_1 = 'subscription_1' SUB_PATH_1 = 'projects/%s/subscriptions/%s' % ( self.PROJECT, SUB_NAME_1) @@ -382,7 +382,7 @@ def test_list_subscriptions_missing_key(self): (self.TOPIC_PATH, None, None)) def test_get_iam_policy_w_bound_client(self): - from gcloud.pubsub.iam import ( + from google.cloud.pubsub.iam import ( PUBSUB_ADMIN_ROLE, PUBSUB_EDITOR_ROLE, PUBSUB_VIEWER_ROLE, @@ -447,8 +447,8 @@ def test_get_iam_policy_w_alternate_client(self): self.assertEqual(api._got_iam_policy, self.TOPIC_PATH) def test_set_iam_policy_w_bound_client(self): - from gcloud.pubsub.iam import Policy - from gcloud.pubsub.iam import ( + from google.cloud.pubsub.iam import Policy + from google.cloud.pubsub.iam import ( PUBSUB_ADMIN_ROLE, PUBSUB_EDITOR_ROLE, PUBSUB_VIEWER_ROLE, @@ -509,7 +509,7 @@ def test_set_iam_policy_w_bound_client(self): self.assertEqual(api._set_iam_policy, (self.TOPIC_PATH, POLICY)) def test_set_iam_policy_w_alternate_client(self): - from gcloud.pubsub.iam import Policy + from google.cloud.pubsub.iam import Policy RESPONSE = {'etag': 'ACAB'} client1 = _Client(project=self.PROJECT) @@ -530,7 +530,10 @@ def test_set_iam_policy_w_alternate_client(self): self.assertEqual(api._set_iam_policy, (self.TOPIC_PATH, {})) def test_check_iam_permissions_w_bound_client(self): - from gcloud.pubsub.iam import OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE + from google.cloud.pubsub.iam import OWNER_ROLE + from google.cloud.pubsub.iam import EDITOR_ROLE + from google.cloud.pubsub.iam import VIEWER_ROLE + ROLES = [VIEWER_ROLE, EDITOR_ROLE, OWNER_ROLE] client = _Client(project=self.PROJECT) api = client.iam_policy_api = _FauxIAMPolicy() @@ -544,7 +547,10 @@ def test_check_iam_permissions_w_bound_client(self): (self.TOPIC_PATH, ROLES)) def test_check_iam_permissions_w_alternate_client(self): - from gcloud.pubsub.iam import OWNER_ROLE, EDITOR_ROLE, VIEWER_ROLE + from google.cloud.pubsub.iam import OWNER_ROLE + from google.cloud.pubsub.iam import EDITOR_ROLE + from google.cloud.pubsub.iam import VIEWER_ROLE + ROLES = [VIEWER_ROLE, EDITOR_ROLE, OWNER_ROLE] client1 = _Client(project=self.PROJECT) client2 = _Client(project=self.PROJECT) @@ -563,7 +569,7 @@ class TestBatch(unittest.TestCase): PROJECT = 'PROJECT' def _getTargetClass(self): - from gcloud.pubsub.topic import Batch + from google.cloud.pubsub.topic import Batch return Batch def _makeOne(self, *args, **kwargs): @@ -735,7 +741,7 @@ def topic_create(self, topic_path): return self._topic_create_response def topic_get(self, topic_path): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._topic_got = topic_path try: return self._topic_get_response diff --git a/unit_tests/resource_manager/test_client.py b/unit_tests/resource_manager/test_client.py index 4041b1bdc368..0d9fe8c793bd 100644 --- a/unit_tests/resource_manager/test_client.py +++ b/unit_tests/resource_manager/test_client.py @@ -18,7 +18,7 @@ class Test__ProjectIterator(unittest.TestCase): def _getTargetClass(self): - from gcloud.resource_manager.client import _ProjectIterator + from google.cloud.resource_manager.client import _ProjectIterator return _ProjectIterator def _makeOne(self, *args, **kw): @@ -39,7 +39,7 @@ def test_get_items_from_response_empty(self): self.assertEqual(list(iterator.get_items_from_response({})), []) def test_get_items_from_response_non_empty(self): - from gcloud.resource_manager.project import Project + from google.cloud.resource_manager.project import Project PROJECT_ID = 'project-id' PROJECT_NAME = 'My Project Name' @@ -72,14 +72,14 @@ def test_get_items_from_response_non_empty(self): class TestClient(unittest.TestCase): def _getTargetClass(self): - from gcloud.resource_manager.client import Client + from google.cloud.resource_manager.client import Client return Client def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) def test_constructor(self): - from gcloud.resource_manager.connection import Connection + from google.cloud.resource_manager.connection import Connection http = object() credentials = _Credentials() @@ -89,7 +89,7 @@ def test_constructor(self): self.assertEqual(client.connection._http, http) def test_new_project_factory(self): - from gcloud.resource_manager.project import Project + from google.cloud.resource_manager.project import Project credentials = _Credentials() client = self._makeOne(credentials=credentials) @@ -105,7 +105,7 @@ def test_new_project_factory(self): self.assertEqual(project.labels, labels) def test_fetch_project(self): - from gcloud.resource_manager.project import Project + from google.cloud.resource_manager.project import Project project_id = 'project-id' project_number = 123 @@ -132,7 +132,7 @@ def test_fetch_project(self): self.assertEqual(project.labels, labels) def test_list_projects_return_type(self): - from gcloud.resource_manager.client import _ProjectIterator + from google.cloud.resource_manager.client import _ProjectIterator credentials = _Credentials() client = self._makeOne(credentials=credentials) diff --git a/unit_tests/resource_manager/test_connection.py b/unit_tests/resource_manager/test_connection.py index 05154905403f..48a47314517c 100644 --- a/unit_tests/resource_manager/test_connection.py +++ b/unit_tests/resource_manager/test_connection.py @@ -18,7 +18,7 @@ class TestConnection(unittest.TestCase): def _getTargetClass(self): - from gcloud.resource_manager.connection import Connection + from google.cloud.resource_manager.connection import Connection return Connection def _makeOne(self, *args, **kw): diff --git a/unit_tests/resource_manager/test_project.py b/unit_tests/resource_manager/test_project.py index 81256e6b42c9..8535e2d81e13 100644 --- a/unit_tests/resource_manager/test_project.py +++ b/unit_tests/resource_manager/test_project.py @@ -18,7 +18,7 @@ class TestProject(unittest.TestCase): def _getTargetClass(self): - from gcloud.resource_manager.project import Project + from google.cloud.resource_manager.project import Project return Project def _makeOne(self, *args, **kw): @@ -323,7 +323,7 @@ def __init__(self, *responses): self._requested = [] def api_request(self, **kw): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._requested.append(kw) try: diff --git a/unit_tests/storage/test__helpers.py b/unit_tests/storage/test__helpers.py index 9f12d6d9908d..c73cc669c159 100644 --- a/unit_tests/storage/test__helpers.py +++ b/unit_tests/storage/test__helpers.py @@ -18,7 +18,7 @@ class Test_PropertyMixin(unittest.TestCase): def _getTargetClass(self): - from gcloud.storage._helpers import _PropertyMixin + from google.cloud.storage._helpers import _PropertyMixin return _PropertyMixin def _makeOne(self, *args, **kw): @@ -97,7 +97,7 @@ def test_patch(self): class Test__scalar_property(unittest.TestCase): def _callFUT(self, fieldName): - from gcloud.storage._helpers import _scalar_property + from google.cloud.storage._helpers import _scalar_property return _scalar_property(fieldName) def test_getter(self): @@ -125,7 +125,7 @@ def _patch_property(self, name, value): class Test__base64_md5hash(unittest.TestCase): def _callFUT(self, bytes_to_sign): - from gcloud.storage._helpers import _base64_md5hash + from google.cloud.storage._helpers import _base64_md5hash return _base64_md5hash(bytes_to_sign) def test_it(self): @@ -140,7 +140,7 @@ def test_it(self): def test_it_with_stubs(self): from unit_tests._testing import _Monkey - from gcloud.storage import _helpers as MUT + from google.cloud.storage import _helpers as MUT class _Buffer(object): diff --git a/unit_tests/storage/test_acl.py b/unit_tests/storage/test_acl.py index f5f6469ae9a6..05baaba14f2f 100644 --- a/unit_tests/storage/test_acl.py +++ b/unit_tests/storage/test_acl.py @@ -18,7 +18,7 @@ class Test_ACLEntity(unittest.TestCase): def _getTargetClass(self): - from gcloud.storage.acl import _ACLEntity + from google.cloud.storage.acl import _ACLEntity return _ACLEntity def _makeOne(self, *args, **kw): @@ -127,7 +127,7 @@ def test_revoke_owner(self): class Test_ACL(unittest.TestCase): def _getTargetClass(self): - from gcloud.storage.acl import ACL + from google.cloud.storage.acl import ACL return ACL def _makeOne(self, *args, **kw): @@ -267,7 +267,7 @@ def _reload(): self.assertTrue(acl.loaded) def test_has_entity_miss_entity(self): - from gcloud.storage.acl import _ACLEntity + from google.cloud.storage.acl import _ACLEntity TYPE = 'type' ID = 'id' entity = _ACLEntity(TYPE, ID) @@ -307,7 +307,7 @@ def _reload(): self.assertTrue(acl.loaded) def test_get_entity_miss_entity_no_default(self): - from gcloud.storage.acl import _ACLEntity + from google.cloud.storage.acl import _ACLEntity TYPE = 'type' ID = 'id' entity = _ACLEntity(TYPE, ID) @@ -322,7 +322,7 @@ def test_get_entity_miss_str_w_default(self): self.assertTrue(acl.get_entity('nonesuch', DEFAULT) is DEFAULT) def test_get_entity_miss_entity_w_default(self): - from gcloud.storage.acl import _ACLEntity + from google.cloud.storage.acl import _ACLEntity DEFAULT = object() TYPE = 'type' ID = 'id' @@ -348,7 +348,7 @@ def test_get_entity_hit_entity(self): self.assertTrue(acl.has_entity(entity)) def test_add_entity_miss_eager(self): - from gcloud.storage.acl import _ACLEntity + from google.cloud.storage.acl import _ACLEntity TYPE = 'type' ID = 'id' ROLE = 'role' @@ -363,7 +363,7 @@ def test_add_entity_miss_eager(self): self.assertEqual(list(acl.get_entities()), [entity]) def test_add_entity_miss_lazy(self): - from gcloud.storage.acl import _ACLEntity + from google.cloud.storage.acl import _ACLEntity TYPE = 'type' ID = 'id' ROLE = 'role' @@ -383,7 +383,7 @@ def _reload(): self.assertTrue(acl.loaded) def test_add_entity_hit(self): - from gcloud.storage.acl import _ACLEntity + from google.cloud.storage.acl import _ACLEntity TYPE = 'type' ID = 'id' ENTITY_VAL = '%s-%s' % (TYPE, ID) @@ -510,7 +510,7 @@ def test_get_entities_nonempty(self): self.assertEqual(acl.get_entities(), [entity]) def test_reload_missing(self): - # https://github.com/GoogleCloudPlatform/gcloud-python/issues/652 + # https://github.com/GoogleCloudPlatform/google-cloud-python/issues/652 ROLE = 'role' connection = _Connection({}) client = _Client(connection) @@ -711,7 +711,7 @@ def test_clear(self): class Test_BucketACL(unittest.TestCase): def _getTargetClass(self): - from gcloud.storage.acl import BucketACL + from google.cloud.storage.acl import BucketACL return BucketACL def _makeOne(self, *args, **kw): @@ -731,7 +731,7 @@ def test_ctor(self): class Test_DefaultObjectACL(unittest.TestCase): def _getTargetClass(self): - from gcloud.storage.acl import DefaultObjectACL + from google.cloud.storage.acl import DefaultObjectACL return DefaultObjectACL def _makeOne(self, *args, **kw): @@ -751,7 +751,7 @@ def test_ctor(self): class Test_ObjectACL(unittest.TestCase): def _getTargetClass(self): - from gcloud.storage.acl import ObjectACL + from google.cloud.storage.acl import ObjectACL return ObjectACL def _makeOne(self, *args, **kw): diff --git a/unit_tests/storage/test_batch.py b/unit_tests/storage/test_batch.py index 5d84eab40904..6c0130515bd0 100644 --- a/unit_tests/storage/test_batch.py +++ b/unit_tests/storage/test_batch.py @@ -18,7 +18,7 @@ class TestMIMEApplicationHTTP(unittest.TestCase): def _getTargetClass(self): - from gcloud.storage.batch import MIMEApplicationHTTP + from google.cloud.storage.batch import MIMEApplicationHTTP return MIMEApplicationHTTP def _makeOne(self, *args, **kw): @@ -69,7 +69,7 @@ def test_ctor_body_dict(self): class TestBatch(unittest.TestCase): def _getTargetClass(self): - from gcloud.storage.batch import Batch + from google.cloud.storage.batch import Batch return Batch def _makeOne(self, *args, **kw): @@ -85,7 +85,7 @@ def test_ctor(self): self.assertEqual(len(batch._target_objects), 0) def test_current(self): - from gcloud.storage.client import Client + from google.cloud.storage.client import Client project = 'PROJECT' credentials = _Credentials() client = Client(project=project, credentials=credentials) @@ -100,7 +100,7 @@ def test_current(self): self.assertTrue(batch1.current() is batch2) def test__make_request_GET_normal(self): - from gcloud.storage.batch import _FutureDict + from google.cloud.storage.batch import _FutureDict URL = 'http://example.com/api' expected = _Response() http = _HTTP((expected, '')) @@ -126,7 +126,7 @@ def test__make_request_GET_normal(self): self.assertEqual(solo_request[3], None) def test__make_request_POST_normal(self): - from gcloud.storage.batch import _FutureDict + from google.cloud.storage.batch import _FutureDict URL = 'http://example.com/api' http = _HTTP() # no requests expected connection = _Connection(http=http) @@ -151,7 +151,7 @@ def test__make_request_POST_normal(self): self.assertEqual(solo_request[3], {'foo': 1}) def test__make_request_PATCH_normal(self): - from gcloud.storage.batch import _FutureDict + from google.cloud.storage.batch import _FutureDict URL = 'http://example.com/api' http = _HTTP() # no requests expected connection = _Connection(http=http) @@ -176,7 +176,7 @@ def test__make_request_PATCH_normal(self): self.assertEqual(solo_request[3], {'foo': 1}) def test__make_request_DELETE_normal(self): - from gcloud.storage.batch import _FutureDict + from google.cloud.storage.batch import _FutureDict URL = 'http://example.com/api' http = _HTTP() # no requests expected connection = _Connection(http=http) @@ -315,7 +315,7 @@ def test_finish_responses_mismatch(self): self.assertRaises(ValueError, batch.finish) def test_finish_nonempty_with_status_failure(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound URL = 'http://api.example.com/other_api' expected = _Response() expected['content-type'] = 'multipart/mixed; boundary="DEADBEEF="' @@ -370,7 +370,7 @@ def test_finish_nonempty_non_multipart_response(self): self.assertRaises(ValueError, batch.finish) def test_as_context_mgr_wo_error(self): - from gcloud.storage.client import Client + from google.cloud.storage.client import Client URL = 'http://example.com/api' expected = _Response() expected['content-type'] = 'multipart/mixed; boundary="DEADBEEF="' @@ -406,8 +406,8 @@ def test_as_context_mgr_wo_error(self): self.assertEqual(target3._properties, '') def test_as_context_mgr_w_error(self): - from gcloud.storage.batch import _FutureDict - from gcloud.storage.client import Client + from google.cloud.storage.batch import _FutureDict + from google.cloud.storage.client import Client URL = 'http://example.com/api' http = _HTTP() connection = _Connection(http=http) @@ -447,7 +447,7 @@ def test_as_context_mgr_w_error(self): class Test__unpack_batch_response(unittest.TestCase): def _callFUT(self, response, content): - from gcloud.storage.batch import _unpack_batch_response + from google.cloud.storage.batch import _unpack_batch_response return _unpack_batch_response(response, content) def _unpack_helper(self, response, content): @@ -538,7 +538,7 @@ def test_unicode(self): class Test__FutureDict(unittest.TestCase): def _makeOne(self, *args, **kw): - from gcloud.storage.batch import _FutureDict + from google.cloud.storage.batch import _FutureDict return _FutureDict(*args, **kw) def test_get(self): diff --git a/unit_tests/storage/test_blob.py b/unit_tests/storage/test_blob.py index 0f1e73cf071c..cc28ca3399ba 100644 --- a/unit_tests/storage/test_blob.py +++ b/unit_tests/storage/test_blob.py @@ -18,7 +18,7 @@ class Test_Blob(unittest.TestCase): def _makeOne(self, *args, **kw): - from gcloud.storage.blob import Blob + from google.cloud.storage.blob import Blob properties = kw.pop('properties', None) blob = Blob(*args, **kw) blob._properties = properties or {} @@ -36,7 +36,7 @@ def test_ctor(self): self.assertTrue(blob._acl.blob is blob) def test_chunk_size_ctor(self): - from gcloud.storage.blob import Blob + from google.cloud.storage.blob import Blob BLOB_NAME = 'blob-name' BUCKET = object() chunk_size = 10 * Blob._CHUNK_SIZE_MULTIPLE @@ -71,7 +71,7 @@ def test_chunk_size_setter_bad_value(self): blob.chunk_size = 11 def test_acl_property(self): - from gcloud.storage.acl import ObjectACL + from google.cloud.storage.acl import ObjectACL FAKE_BUCKET = _Bucket() blob = self._makeOne(None, bucket=FAKE_BUCKET) acl = blob.acl @@ -119,7 +119,7 @@ def test_public_url_w_slash_in_name(self): def _basic_generate_signed_url_helper(self, credentials=None): from unit_tests._testing import _Monkey - from gcloud.storage import blob as MUT + from google.cloud.storage import blob as MUT BLOB_NAME = 'blob-name' EXPIRATION = '2014-10-16T20:34:37.000Z' @@ -158,7 +158,7 @@ def test_generate_signed_url_w_default_method(self): def test_generate_signed_url_w_content_type(self): from unit_tests._testing import _Monkey - from gcloud.storage import blob as MUT + from google.cloud.storage import blob as MUT BLOB_NAME = 'blob-name' EXPIRATION = '2014-10-16T20:34:37.000Z' @@ -196,7 +196,7 @@ def test_generate_signed_url_w_credentials(self): def test_generate_signed_url_w_slash_in_name(self): from unit_tests._testing import _Monkey - from gcloud.storage import blob as MUT + from google.cloud.storage import blob as MUT BLOB_NAME = 'parent/child' EXPIRATION = '2014-10-16T20:34:37.000Z' @@ -227,7 +227,7 @@ def test_generate_signed_url_w_slash_in_name(self): def test_generate_signed_url_w_method_arg(self): from unit_tests._testing import _Monkey - from gcloud.storage import blob as MUT + from google.cloud.storage import blob as MUT BLOB_NAME = 'blob-name' EXPIRATION = '2014-10-16T20:34:37.000Z' @@ -511,7 +511,7 @@ def test_upload_from_file_stream(self): from six.moves.http_client import OK from six.moves.urllib.parse import parse_qsl from six.moves.urllib.parse import urlsplit - from gcloud.streaming import http_wrapper + from google.cloud.streaming import http_wrapper BLOB_NAME = 'blob-name' UPLOAD_URL = 'http://example.com/upload/name/key' @@ -608,7 +608,7 @@ def test_upload_from_file_simple(self): def test_upload_from_file_simple_not_found(self): from six.moves.http_client import NOT_FOUND - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound with self.assertRaises(NotFound): self._upload_from_file_simple_test_helper(status=NOT_FOUND) @@ -643,8 +643,8 @@ def test_upload_from_file_resumable(self): from six.moves.urllib.parse import urlsplit from unit_tests._testing import _Monkey from unit_tests._testing import _NamedTemporaryFile - from gcloud.streaming import http_wrapper - from gcloud.streaming import transfer + from google.cloud.streaming import http_wrapper + from google.cloud.streaming import transfer BLOB_NAME = 'blob-name' UPLOAD_URL = 'http://example.com/upload/name/key' @@ -727,8 +727,8 @@ def test_upload_from_file_resumable_w_error(self): from six.moves.urllib.parse import urlsplit from unit_tests._testing import _Monkey from unit_tests._testing import _NamedTemporaryFile - from gcloud.streaming import transfer - from gcloud.streaming.exceptions import HttpError + from google.cloud.streaming import transfer + from google.cloud.streaming.exceptions import HttpError BLOB_NAME = 'blob-name' DATA = b'ABCDEF' @@ -780,7 +780,7 @@ def test_upload_from_file_w_slash_in_name(self): from six.moves.urllib.parse import parse_qsl from six.moves.urllib.parse import urlsplit from unit_tests._testing import _NamedTemporaryFile - from gcloud.streaming import http_wrapper + from google.cloud.streaming import http_wrapper BLOB_NAME = 'parent/child' UPLOAD_URL = 'http://example.com/upload/name/parent%2Fchild' @@ -830,7 +830,7 @@ def test_upload_from_filename_w_key(self): from six.moves.urllib.parse import parse_qsl from six.moves.urllib.parse import urlsplit from unit_tests._testing import _NamedTemporaryFile - from gcloud.streaming import http_wrapper + from google.cloud.streaming import http_wrapper BLOB_NAME = 'blob-name' UPLOAD_URL = 'http://example.com/upload/name/key' @@ -889,7 +889,7 @@ def _upload_from_filename_test_helper(self, properties=None, from six.moves.urllib.parse import parse_qsl from six.moves.urllib.parse import urlsplit from unit_tests._testing import _NamedTemporaryFile - from gcloud.streaming import http_wrapper + from google.cloud.streaming import http_wrapper BLOB_NAME = 'blob-name' UPLOAD_URL = 'http://example.com/upload/name/key' @@ -959,7 +959,7 @@ def test_upload_from_string_w_bytes(self): from six.moves.http_client import OK from six.moves.urllib.parse import parse_qsl from six.moves.urllib.parse import urlsplit - from gcloud.streaming import http_wrapper + from google.cloud.streaming import http_wrapper BLOB_NAME = 'blob-name' UPLOAD_URL = 'http://example.com/upload/name/key' DATA = b'ABCDEF' @@ -998,7 +998,7 @@ def test_upload_from_string_w_text(self): from six.moves.http_client import OK from six.moves.urllib.parse import parse_qsl from six.moves.urllib.parse import urlsplit - from gcloud.streaming import http_wrapper + from google.cloud.streaming import http_wrapper BLOB_NAME = 'blob-name' UPLOAD_URL = 'http://example.com/upload/name/key' DATA = u'ABCDEF\u1234' @@ -1038,7 +1038,7 @@ def test_upload_from_string_text_w_key(self): from six.moves.http_client import OK from six.moves.urllib.parse import parse_qsl from six.moves.urllib.parse import urlsplit - from gcloud.streaming import http_wrapper + from google.cloud.streaming import http_wrapper BLOB_NAME = 'blob-name' KEY = 'aa426195405adee2c8081bb9e7e74b19' HEADER_KEY_VALUE = 'YWE0MjYxOTU0MDVhZGVlMmM4MDgxYmI5ZTdlNzRiMTk=' @@ -1084,7 +1084,7 @@ def test_upload_from_string_text_w_key(self): def test_make_public(self): from six.moves.http_client import OK - from gcloud.storage.acl import _ACLEntity + from google.cloud.storage.acl import _ACLEntity BLOB_NAME = 'blob-name' permissive = [{'entity': 'allUsers', 'role': _ACLEntity.READER_ROLE}] after = ({'status': OK}, {'acl': permissive}) @@ -1368,8 +1368,8 @@ def test_storage_class(self): def test_time_deleted(self): import datetime - from gcloud._helpers import _RFC3339_MICROS - from gcloud._helpers import UTC + from google.cloud._helpers import _RFC3339_MICROS + from google.cloud._helpers import UTC BLOB_NAME = 'blob-name' bucket = _Bucket() TIMESTAMP = datetime.datetime(2014, 11, 5, 20, 34, 37, tzinfo=UTC) @@ -1385,8 +1385,8 @@ def test_time_deleted_unset(self): def test_updated(self): import datetime - from gcloud._helpers import _RFC3339_MICROS - from gcloud._helpers import UTC + from google.cloud._helpers import _RFC3339_MICROS + from google.cloud._helpers import UTC BLOB_NAME = 'blob-name' bucket = _Bucket() TIMESTAMP = datetime.datetime(2014, 11, 5, 20, 34, 37, tzinfo=UTC) @@ -1426,7 +1426,7 @@ def __init__(self, *responses): def api_request(self, **kw): from six.moves.http_client import NOT_FOUND - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound info, content = self._respond(**kw) if info.get('status') == NOT_FOUND: raise NotFound(info) diff --git a/unit_tests/storage/test_bucket.py b/unit_tests/storage/test_bucket.py index 765fa96c0059..68325a4392d4 100644 --- a/unit_tests/storage/test_bucket.py +++ b/unit_tests/storage/test_bucket.py @@ -18,7 +18,7 @@ class Test__BlobIterator(unittest.TestCase): def _getTargetClass(self): - from gcloud.storage.bucket import _BlobIterator + from google.cloud.storage.bucket import _BlobIterator return _BlobIterator def _makeOne(self, *args, **kw): @@ -46,7 +46,7 @@ def test_get_items_from_response_empty(self): self.assertEqual(iterator.prefixes, set()) def test_get_items_from_response_non_empty(self): - from gcloud.storage.blob import Blob + from google.cloud.storage.blob import Blob BLOB_NAME = 'blob-name' response = {'items': [{'name': BLOB_NAME}], 'prefixes': ['foo']} connection = _Connection() @@ -61,7 +61,7 @@ def test_get_items_from_response_non_empty(self): self.assertEqual(iterator.prefixes, set(['foo'])) def test_get_items_from_response_cumulative_prefixes(self): - from gcloud.storage.blob import Blob + from google.cloud.storage.blob import Blob BLOB_NAME = 'blob-name1' response1 = {'items': [{'name': BLOB_NAME}], 'prefixes': ['foo']} response2 = { @@ -88,7 +88,7 @@ def test_get_items_from_response_cumulative_prefixes(self): class Test_Bucket(unittest.TestCase): def _makeOne(self, client=None, name=None, properties=None): - from gcloud.storage.bucket import Bucket + from google.cloud.storage.bucket import Bucket if client is None: connection = _Connection() client = _Client(connection) @@ -108,7 +108,7 @@ def test_ctor(self): self.assertTrue(bucket._default_object_acl.bucket is bucket) def test_blob(self): - from gcloud.storage.blob import Blob + from google.cloud.storage.blob import Blob BUCKET_NAME = 'BUCKET_NAME' BLOB_NAME = 'BLOB_NAME' @@ -123,7 +123,7 @@ def test_blob(self): self.assertEqual(blob.chunk_size, CHUNK_SIZE) def test_exists_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound class _FakeConnection(object): @@ -230,14 +230,14 @@ def test_create_w_extra_properties(self): self.assertEqual(kw['data'], DATA) def test_acl_property(self): - from gcloud.storage.acl import BucketACL + from google.cloud.storage.acl import BucketACL bucket = self._makeOne() acl = bucket.acl self.assertTrue(isinstance(acl, BucketACL)) self.assertTrue(acl is bucket._acl) def test_default_object_acl_property(self): - from gcloud.storage.acl import DefaultObjectACL + from google.cloud.storage.acl import DefaultObjectACL bucket = self._makeOne() acl = bucket.default_object_acl self.assertTrue(isinstance(acl, DefaultObjectACL)) @@ -342,7 +342,7 @@ def test_list_blobs(self): self.assertEqual(kw['query_params'], {'projection': 'noAcl'}) def test_delete_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound NAME = 'name' connection = _Connection() client = _Client(connection) @@ -435,7 +435,7 @@ def test_delete_too_many(self): self.assertEqual(connection._deleted_buckets, []) def test_delete_blob_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound NAME = 'name' NONESUCH = 'nonesuch' connection = _Connection() @@ -479,7 +479,7 @@ def test_delete_blobs_hit(self): self.assertEqual(kw[0]['path'], '/b/%s/o/%s' % (NAME, BLOB_NAME)) def test_delete_blobs_miss_no_on_error(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound NAME = 'name' BLOB_NAME = 'blob-name' NONESUCH = 'nonesuch' @@ -790,8 +790,8 @@ def test_storage_class_setter_DURABLE_REDUCED_AVAILABILITY(self): def test_time_created(self): import datetime - from gcloud._helpers import _RFC3339_MICROS - from gcloud._helpers import UTC + from google.cloud._helpers import _RFC3339_MICROS + from google.cloud._helpers import UTC TIMESTAMP = datetime.datetime(2014, 11, 5, 20, 34, 37, tzinfo=UTC) TIME_CREATED = TIMESTAMP.strftime(_RFC3339_MICROS) properties = {'timeCreated': TIME_CREATED} @@ -845,7 +845,7 @@ def test_disable_website(self): self.assertEqual(bucket._properties, UNSET) def test_make_public_defaults(self): - from gcloud.storage.acl import _ACLEntity + from google.cloud.storage.acl import _ACLEntity NAME = 'name' permissive = [{'entity': 'allUsers', 'role': _ACLEntity.READER_ROLE}] after = {'acl': permissive, 'defaultObjectAcl': []} @@ -865,7 +865,7 @@ def test_make_public_defaults(self): self.assertEqual(kw[0]['query_params'], {'projection': 'full'}) def _make_public_w_future_helper(self, default_object_acl_loaded=True): - from gcloud.storage.acl import _ACLEntity + from google.cloud.storage.acl import _ACLEntity NAME = 'name' permissive = [{'entity': 'allUsers', 'role': _ACLEntity.READER_ROLE}] after1 = {'acl': permissive, 'defaultObjectAcl': []} @@ -907,8 +907,8 @@ def test_make_public_w_future_reload_default(self): self._make_public_w_future_helper(default_object_acl_loaded=False) def test_make_public_recursive(self): - from gcloud.storage.acl import _ACLEntity - from gcloud.storage.bucket import _BlobIterator + from google.cloud.storage.acl import _ACLEntity + from google.cloud.storage.bucket import _BlobIterator _saved = [] class _Blob(object): @@ -965,7 +965,7 @@ def get_items_from_response(self, response): {'maxResults': max_results, 'projection': 'full'}) def test_make_public_recursive_too_many(self): - from gcloud.storage.acl import _ACLEntity + from google.cloud.storage.acl import _ACLEntity PERMISSIVE = [{'entity': 'allUsers', 'role': _ACLEntity.READER_ROLE}] AFTER = {'acl': PERMISSIVE, 'defaultObjectAcl': []} @@ -1004,7 +1004,7 @@ def _is_bucket_path(path): return path.startswith('/b/') and path.count('/') == 2 def api_request(self, **kw): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound self._requested.append(kw) method = kw.get('method') diff --git a/unit_tests/storage/test_client.py b/unit_tests/storage/test_client.py index 2ef2dbd91010..26e2f1dd8916 100644 --- a/unit_tests/storage/test_client.py +++ b/unit_tests/storage/test_client.py @@ -18,14 +18,14 @@ class TestClient(unittest.TestCase): def _getTargetClass(self): - from gcloud.storage.client import Client + from google.cloud.storage.client import Client return Client def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) def test_ctor_connection_type(self): - from gcloud.storage.connection import Connection + from google.cloud.storage.connection import Connection PROJECT = 'PROJECT' CREDENTIALS = _Credentials() @@ -38,7 +38,7 @@ def test_ctor_connection_type(self): self.assertEqual(list(client._batch_stack), []) def test__push_batch_and__pop_batch(self): - from gcloud.storage.batch import Batch + from google.cloud.storage.batch import Batch PROJECT = 'PROJECT' CREDENTIALS = _Credentials() @@ -80,7 +80,7 @@ def test_connection_getter_no_batch(self): self.assertTrue(client.current_batch is None) def test_connection_getter_with_batch(self): - from gcloud.storage.batch import Batch + from google.cloud.storage.batch import Batch PROJECT = 'PROJECT' CREDENTIALS = _Credentials() client = self._makeOne(project=PROJECT, credentials=CREDENTIALS) @@ -91,7 +91,7 @@ def test_connection_getter_with_batch(self): self.assertTrue(client.current_batch is batch) def test_bucket(self): - from gcloud.storage.bucket import Bucket + from google.cloud.storage.bucket import Bucket PROJECT = 'PROJECT' CREDENTIALS = _Credentials() @@ -104,7 +104,7 @@ def test_bucket(self): self.assertEqual(bucket.name, BUCKET_NAME) def test_batch(self): - from gcloud.storage.batch import Batch + from google.cloud.storage.batch import Batch PROJECT = 'PROJECT' CREDENTIALS = _Credentials() @@ -115,7 +115,7 @@ def test_batch(self): self.assertTrue(batch._client is client) def test_get_bucket_miss(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound PROJECT = 'PROJECT' CREDENTIALS = _Credentials() @@ -138,7 +138,7 @@ def test_get_bucket_miss(self): self.assertEqual(http._called_with['uri'], URI) def test_get_bucket_hit(self): - from gcloud.storage.bucket import Bucket + from google.cloud.storage.bucket import Bucket PROJECT = 'PROJECT' CREDENTIALS = _Credentials() @@ -186,7 +186,7 @@ def test_lookup_bucket_miss(self): self.assertEqual(http._called_with['uri'], URI) def test_lookup_bucket_hit(self): - from gcloud.storage.bucket import Bucket + from google.cloud.storage.bucket import Bucket PROJECT = 'PROJECT' CREDENTIALS = _Credentials() @@ -212,7 +212,7 @@ def test_lookup_bucket_hit(self): self.assertEqual(http._called_with['uri'], URI) def test_create_bucket_conflict(self): - from gcloud.exceptions import Conflict + from google.cloud.exceptions import Conflict PROJECT = 'PROJECT' CREDENTIALS = _Credentials() @@ -235,7 +235,7 @@ def test_create_bucket_conflict(self): self.assertEqual(http._called_with['uri'], URI) def test_create_bucket_success(self): - from gcloud.storage.bucket import Bucket + from google.cloud.storage.bucket import Bucket PROJECT = 'PROJECT' CREDENTIALS = _Credentials() @@ -373,7 +373,7 @@ def test_list_buckets_all_arguments(self): class Test__BucketIterator(unittest.TestCase): def _getTargetClass(self): - from gcloud.storage.client import _BucketIterator + from google.cloud.storage.client import _BucketIterator return _BucketIterator def _makeOne(self, *args, **kw): @@ -395,7 +395,7 @@ def test_get_items_from_response_empty(self): self.assertEqual(list(iterator.get_items_from_response({})), []) def test_get_items_from_response_non_empty(self): - from gcloud.storage.bucket import Bucket + from google.cloud.storage.bucket import Bucket BLOB_NAME = 'blob-name' response = {'items': [{'name': BLOB_NAME}]} connection = object() diff --git a/unit_tests/storage/test_connection.py b/unit_tests/storage/test_connection.py index 8555919f34c2..b5ed0303a3d0 100644 --- a/unit_tests/storage/test_connection.py +++ b/unit_tests/storage/test_connection.py @@ -18,7 +18,7 @@ class TestConnection(unittest.TestCase): def _getTargetClass(self): - from gcloud.storage.connection import Connection + from google.cloud.storage.connection import Connection return Connection def _makeOne(self, *args, **kw): diff --git a/unit_tests/streaming/test_buffered_stream.py b/unit_tests/streaming/test_buffered_stream.py index fca8f26efebe..f461e782df80 100644 --- a/unit_tests/streaming/test_buffered_stream.py +++ b/unit_tests/streaming/test_buffered_stream.py @@ -4,7 +4,7 @@ class Test_BufferedStream(unittest.TestCase): def _getTargetClass(self): - from gcloud.streaming.buffered_stream import BufferedStream + from google.cloud.streaming.buffered_stream import BufferedStream return BufferedStream def _makeOne(self, *args, **kw): diff --git a/unit_tests/streaming/test_exceptions.py b/unit_tests/streaming/test_exceptions.py index ca974377e5b5..d2a69834f1b7 100644 --- a/unit_tests/streaming/test_exceptions.py +++ b/unit_tests/streaming/test_exceptions.py @@ -4,7 +4,7 @@ class Test_HttpError(unittest.TestCase): def _getTargetClass(self): - from gcloud.streaming.exceptions import HttpError + from google.cloud.streaming.exceptions import HttpError return HttpError def _makeOne(self, *args, **kw): @@ -45,7 +45,7 @@ class _Response(object): class Test_RetryAfterError(unittest.TestCase): def _getTargetClass(self): - from gcloud.streaming.exceptions import RetryAfterError + from google.cloud.streaming.exceptions import RetryAfterError return RetryAfterError def _makeOne(self, *args, **kw): diff --git a/unit_tests/streaming/test_http_wrapper.py b/unit_tests/streaming/test_http_wrapper.py index 84096a46c6ca..61f95112100b 100644 --- a/unit_tests/streaming/test_http_wrapper.py +++ b/unit_tests/streaming/test_http_wrapper.py @@ -4,7 +4,7 @@ class Test__httplib2_debug_level(unittest.TestCase): def _getTargetClass(self): - from gcloud.streaming.http_wrapper import _httplib2_debug_level + from google.cloud.streaming.http_wrapper import _httplib2_debug_level return _httplib2_debug_level def _makeOne(self, *args, **kw): @@ -12,7 +12,7 @@ def _makeOne(self, *args, **kw): def test_wo_loggable_body_wo_http(self): from unit_tests._testing import _Monkey - from gcloud.streaming import http_wrapper as MUT + from google.cloud.streaming import http_wrapper as MUT request = _Request() LEVEL = 1 @@ -23,7 +23,7 @@ def test_wo_loggable_body_wo_http(self): def test_w_loggable_body_wo_http(self): from unit_tests._testing import _Monkey - from gcloud.streaming import http_wrapper as MUT + from google.cloud.streaming import http_wrapper as MUT request = _Request(loggable_body=object()) LEVEL = 1 @@ -35,7 +35,7 @@ def test_w_loggable_body_wo_http(self): def test_w_loggable_body_w_http(self): from unit_tests._testing import _Monkey - from gcloud.streaming import http_wrapper as MUT + from google.cloud.streaming import http_wrapper as MUT class _Connection(object): debuglevel = 0 @@ -63,7 +63,7 @@ def set_debuglevel(self, value): class Test_Request(unittest.TestCase): def _getTargetClass(self): - from gcloud.streaming.http_wrapper import Request + from google.cloud.streaming.http_wrapper import Request return Request def _makeOne(self, *args, **kw): @@ -78,7 +78,7 @@ def test_ctor_defaults(self): self.assertEqual(request.loggable_body, None) def test_loggable_body_setter_w_body_None(self): - from gcloud.streaming.exceptions import RequestError + from google.cloud.streaming.exceptions import RequestError request = self._makeOne(body=None) with self.assertRaises(RequestError): request.loggable_body = 'abc' @@ -103,7 +103,7 @@ def test_body_setter_w_non_string(self): class Test_Response(unittest.TestCase): def _getTargetClass(self): - from gcloud.streaming.http_wrapper import Response + from google.cloud.streaming.http_wrapper import Response return Response def _makeOne(self, *args, **kw): @@ -199,23 +199,23 @@ def test_is_redirect_w_code_w_location(self): class Test__check_response(unittest.TestCase): def _callFUT(self, *args, **kw): - from gcloud.streaming.http_wrapper import _check_response + from google.cloud.streaming.http_wrapper import _check_response return _check_response(*args, **kw) def test_w_none(self): - from gcloud.streaming.exceptions import RequestError + from google.cloud.streaming.exceptions import RequestError with self.assertRaises(RequestError): self._callFUT(None) def test_w_TOO_MANY_REQUESTS(self): - from gcloud.streaming.exceptions import BadStatusCodeError - from gcloud.streaming.http_wrapper import TOO_MANY_REQUESTS + from google.cloud.streaming.exceptions import BadStatusCodeError + from google.cloud.streaming.http_wrapper import TOO_MANY_REQUESTS with self.assertRaises(BadStatusCodeError): self._callFUT(_Response(TOO_MANY_REQUESTS)) def test_w_50x(self): - from gcloud.streaming.exceptions import BadStatusCodeError + from google.cloud.streaming.exceptions import BadStatusCodeError with self.assertRaises(BadStatusCodeError): self._callFUT(_Response(500)) @@ -224,7 +224,7 @@ def test_w_50x(self): self._callFUT(_Response(503)) def test_w_retry_after(self): - from gcloud.streaming.exceptions import RetryAfterError + from google.cloud.streaming.exceptions import RetryAfterError with self.assertRaises(RetryAfterError): self._callFUT(_Response(200, 20)) @@ -236,7 +236,7 @@ def test_pass(self): class Test__reset_http_connections(unittest.TestCase): def _callFUT(self, *args, **kw): - from gcloud.streaming.http_wrapper import _reset_http_connections + from google.cloud.streaming.http_wrapper import _reset_http_connections return _reset_http_connections(*args, **kw) def test_wo_connections(self): @@ -254,7 +254,8 @@ def test_w_connections(self): class Test___make_api_request_no_retry(unittest.TestCase): def _callFUT(self, *args, **kw): - from gcloud.streaming.http_wrapper import _make_api_request_no_retry + 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, @@ -270,7 +271,7 @@ def _verify_requested(self, http, request, def test_defaults_wo_connections(self): from unit_tests._testing import _Monkey - from gcloud.streaming import http_wrapper as MUT + from google.cloud.streaming import http_wrapper as MUT INFO = {'status': '200'} CONTENT = 'CONTENT' _http = _Http((INFO, CONTENT)) @@ -290,7 +291,7 @@ def test_defaults_wo_connections(self): def test_w_http_connections_miss(self): from unit_tests._testing import _Monkey - from gcloud.streaming import http_wrapper as MUT + from google.cloud.streaming import http_wrapper as MUT INFO = {'status': '200'} CONTENT = 'CONTENT' CONN_TYPE = object() @@ -312,7 +313,7 @@ def test_w_http_connections_miss(self): def test_w_http_connections_hit(self): from unit_tests._testing import _Monkey - from gcloud.streaming import http_wrapper as MUT + from google.cloud.streaming import http_wrapper as MUT INFO = {'status': '200'} CONTENT = 'CONTENT' CONN_TYPE = object() @@ -334,8 +335,8 @@ def test_w_http_connections_hit(self): def test_w_request_returning_None(self): from unit_tests._testing import _Monkey - from gcloud.streaming import http_wrapper as MUT - from gcloud.streaming.exceptions import RequestError + from google.cloud.streaming import http_wrapper as MUT + from google.cloud.streaming.exceptions import RequestError INFO = None CONTENT = None CONN_TYPE = object() @@ -352,11 +353,11 @@ def test_w_request_returning_None(self): class Test_make_api_request(unittest.TestCase): def _callFUT(self, *args, **kw): - from gcloud.streaming.http_wrapper import make_api_request + from google.cloud.streaming.http_wrapper import make_api_request return make_api_request(*args, **kw) def test_wo_exception(self): - from gcloud.streaming import http_wrapper as MUT + from google.cloud.streaming import http_wrapper as MUT from unit_tests._testing import _Monkey HTTP, REQUEST, RESPONSE = object(), object(), object() @@ -376,8 +377,8 @@ def _wo_exception(*args, **kw): self.assertEqual(_checked, []) # not called by '_wo_exception' def test_w_exceptions_lt_max_retries(self): - from gcloud.streaming.exceptions import RetryAfterError - from gcloud.streaming import http_wrapper as MUT + from google.cloud.streaming.exceptions import RetryAfterError + from google.cloud.streaming import http_wrapper as MUT from unit_tests._testing import _Monkey HTTP, RESPONSE = object(), object() @@ -405,7 +406,7 @@ def _wo_exception(*args, **kw): def test_w_exceptions_gt_max_retries(self): from unit_tests._testing import _Monkey - from gcloud.streaming import http_wrapper as MUT + from google.cloud.streaming import http_wrapper as MUT HTTP = object() REQUEST = _Request() _created, _checked = [], [] diff --git a/unit_tests/streaming/test_stream_slice.py b/unit_tests/streaming/test_stream_slice.py index 4d7e4bd3df7b..9f94715f6082 100644 --- a/unit_tests/streaming/test_stream_slice.py +++ b/unit_tests/streaming/test_stream_slice.py @@ -4,7 +4,7 @@ class Test_StreamSlice(unittest.TestCase): def _getTargetClass(self): - from gcloud.streaming.stream_slice import StreamSlice + from google.cloud.streaming.stream_slice import StreamSlice return StreamSlice def _makeOne(self, *args, **kw): diff --git a/unit_tests/streaming/test_transfer.py b/unit_tests/streaming/test_transfer.py index 2857e4639c0e..fc0d040efe4c 100644 --- a/unit_tests/streaming/test_transfer.py +++ b/unit_tests/streaming/test_transfer.py @@ -5,14 +5,14 @@ class Test__Transfer(unittest.TestCase): URL = 'http://example.com/api' def _getTargetClass(self): - from gcloud.streaming.transfer import _Transfer + from google.cloud.streaming.transfer import _Transfer return _Transfer def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) def test_ctor_defaults(self): - from gcloud.streaming.transfer import _DEFAULT_CHUNKSIZE + from google.cloud.streaming.transfer import _DEFAULT_CHUNKSIZE stream = _Stream() xfer = self._makeOne(stream) self.assertTrue(xfer.stream is stream) @@ -98,7 +98,7 @@ def test__initialize_w_existing_http(self): self.assertTrue(xfer.url is self.URL) def test__initialize_already_initialized(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError URL_2 = 'http://example.com/other' HTTP_1, HTTP_2 = object(), object() stream = _Stream() @@ -115,7 +115,7 @@ def test__ensure_initialized_hit(self): xfer._ensure_initialized() # no raise def test__ensure_initialized_miss(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError stream = _Stream() xfer = self._makeOne(stream) with self.assertRaises(TransferInvalidError): @@ -127,7 +127,7 @@ def test__ensure_uninitialized_hit(self): xfer._ensure_uninitialized() # no raise def test__ensure_uninitialized_miss(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError stream = _Stream() HTTP = object() xfer = self._makeOne(stream) @@ -149,7 +149,7 @@ class Test_Download(unittest.TestCase): URL = "http://example.com/api" def _getTargetClass(self): - from gcloud.streaming.transfer import Download + from google.cloud.streaming.transfer import Download return Download def _makeOne(self, *args, **kw): @@ -258,7 +258,7 @@ def test__set_total_w_content_range_w_asterisk_total(self): self.assertEqual(download.total_size, 0) def test_initialize_download_already_initialized(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError request = _Request() download = self._makeOne(_Stream()) download._initialize(None, self.URL) @@ -276,8 +276,8 @@ def test_initialize_download_wo_autotransfer(self): def test_initialize_download_w_autotransfer_failing(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT - from gcloud.streaming.exceptions import HttpError + from google.cloud.streaming import transfer as MUT + from google.cloud.streaming.exceptions import HttpError request = _Request() http = object() download = self._makeOne(_Stream(), auto_transfer=True) @@ -295,7 +295,7 @@ def test_initialize_download_w_autotransfer_failing(self): def test_initialize_download_w_autotransfer_w_content_location(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT + from google.cloud.streaming import transfer as MUT REDIRECT_URL = 'http://example.com/other' request = _Request() http = object() @@ -316,14 +316,14 @@ def test_initialize_download_w_autotransfer_w_content_location(self): self.assertTrue(requester._requested[0][0] is request) def test__normalize_start_end_w_end_w_start_lt_0(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError download = self._makeOne(_Stream()) with self.assertRaises(TransferInvalidError): download._normalize_start_end(-1, 0) def test__normalize_start_end_w_end_w_start_gt_total(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError download = self._makeOne(_Stream()) download._set_total({'content-range': 'bytes 0-1/2'}) @@ -331,7 +331,7 @@ def test__normalize_start_end_w_end_w_start_gt_total(self): download._normalize_start_end(3, 0) def test__normalize_start_end_w_end_lt_start(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError download = self._makeOne(_Stream()) download._set_total({'content-range': 'bytes 0-1/2'}) @@ -403,7 +403,7 @@ def test__compute_end_byte_w_start_ge_0_wo_end_w_total_size(self): self.assertEqual(download._compute_end_byte(0, use_chunks=False), 9) def test__get_chunk_not_initialized(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError download = self._makeOne(_Stream()) with self.assertRaises(TransferInvalidError): @@ -412,7 +412,7 @@ def test__get_chunk_not_initialized(self): def test__get_chunk(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT + from google.cloud.streaming import transfer as MUT http = object() download = self._makeOne(_Stream()) download._initialize(http, self.URL) @@ -430,7 +430,7 @@ def test__get_chunk(self): self.assertEqual(request.headers['range'], 'bytes=0-10') def test__process_response_w_FORBIDDEN(self): - from gcloud.streaming.exceptions import HttpError + from google.cloud.streaming.exceptions import HttpError from six.moves import http_client download = self._makeOne(_Stream()) response = _makeResponse(http_client.FORBIDDEN) @@ -438,7 +438,7 @@ def test__process_response_w_FORBIDDEN(self): download._process_response(response) def test__process_response_w_NOT_FOUND(self): - from gcloud.streaming.exceptions import HttpError + from google.cloud.streaming.exceptions import HttpError from six.moves import http_client download = self._makeOne(_Stream()) response = _makeResponse(http_client.NOT_FOUND) @@ -446,7 +446,7 @@ def test__process_response_w_NOT_FOUND(self): download._process_response(response) def test__process_response_w_other_error(self): - from gcloud.streaming.exceptions import TransferRetryError + from google.cloud.streaming.exceptions import TransferRetryError from six.moves import http_client download = self._makeOne(_Stream()) response = _makeResponse(http_client.BAD_REQUEST) @@ -500,7 +500,7 @@ def test__process_response_w_NO_CONTENT(self): self.assertEqual(download.encoding, None) def test_get_range_not_initialized(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError download = self._makeOne(_Stream()) with self.assertRaises(TransferInvalidError): download.get_range(0, 10) @@ -508,7 +508,7 @@ def test_get_range_not_initialized(self): def test_get_range_wo_total_size_complete(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT + from google.cloud.streaming import transfer as MUT CONTENT = b'ABCDEFGHIJ' LEN = len(CONTENT) REQ_RANGE = 'bytes=0-%d' % (LEN,) @@ -535,7 +535,7 @@ def test_get_range_wo_total_size_complete(self): def test_get_range_wo_total_size_wo_end(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT + from google.cloud.streaming import transfer as MUT CONTENT = b'ABCDEFGHIJ' LEN = len(CONTENT) START = 5 @@ -564,7 +564,7 @@ def test_get_range_wo_total_size_wo_end(self): def test_get_range_w_total_size_partial(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT + from google.cloud.streaming import transfer as MUT CONTENT = b'ABCDEFGHIJ' LEN = len(CONTENT) PARTIAL_LEN = 5 @@ -593,8 +593,8 @@ def test_get_range_w_total_size_partial(self): def test_get_range_w_empty_chunk(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT - from gcloud.streaming.exceptions import TransferRetryError + from google.cloud.streaming import transfer as MUT + from google.cloud.streaming.exceptions import TransferRetryError CONTENT = b'ABCDEFGHIJ' LEN = len(CONTENT) START = 5 @@ -624,7 +624,7 @@ def test_get_range_w_empty_chunk(self): def test_get_range_w_total_size_wo_use_chunks(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT + from google.cloud.streaming import transfer as MUT CONTENT = b'ABCDEFGHIJ' LEN = len(CONTENT) CHUNK_SIZE = 3 @@ -652,7 +652,7 @@ def test_get_range_w_total_size_wo_use_chunks(self): def test_get_range_w_multiple_chunks(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT + from google.cloud.streaming import transfer as MUT CONTENT = b'ABCDE' LEN = len(CONTENT) CHUNK_SIZE = 3 @@ -686,7 +686,7 @@ def test_get_range_w_multiple_chunks(self): self.assertEqual(download.total_size, LEN) def test_stream_file_not_initialized(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError download = self._makeOne(_Stream()) with self.assertRaises(TransferInvalidError): @@ -713,7 +713,7 @@ def test_stream_file_w_initial_response_complete(self): def test_stream_file_w_initial_response_incomplete(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT + from google.cloud.streaming import transfer as MUT CHUNK_SIZE = 3 CONTENT = b'ABCDEF' LEN = len(CONTENT) @@ -750,7 +750,7 @@ def test_stream_file_w_initial_response_incomplete(self): def test_stream_file_wo_initial_response_wo_total_size(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT + from google.cloud.streaming import transfer as MUT CONTENT = b'ABCDEFGHIJ' LEN = len(CONTENT) CHUNK_SIZE = 123 @@ -784,14 +784,14 @@ class Test_Upload(unittest.TestCase): UPLOAD_URL = 'http://example.com/upload/id=foobar' def _getTargetClass(self): - from gcloud.streaming.transfer import Upload + from google.cloud.streaming.transfer import Upload return Upload def _makeOne(self, stream, mime_type=MIME_TYPE, *args, **kw): return self._getTargetClass()(stream, mime_type, *args, **kw) def test_ctor_defaults(self): - from gcloud.streaming.transfer import _DEFAULT_CHUNKSIZE + from google.cloud.streaming.transfer import _DEFAULT_CHUNKSIZE stream = _Stream() upload = self._makeOne(stream) self.assertTrue(upload.stream is stream) @@ -901,19 +901,19 @@ def test_strategy_setter_invalid(self): upload.strategy = 'unknown' def test_strategy_setter_SIMPLE_UPLOAD(self): - from gcloud.streaming.transfer import SIMPLE_UPLOAD + from google.cloud.streaming.transfer import SIMPLE_UPLOAD upload = self._makeOne(_Stream()) upload.strategy = SIMPLE_UPLOAD self.assertEqual(upload.strategy, SIMPLE_UPLOAD) def test_strategy_setter_RESUMABLE_UPLOAD(self): - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD upload = self._makeOne(_Stream()) upload.strategy = RESUMABLE_UPLOAD self.assertEqual(upload.strategy, RESUMABLE_UPLOAD) def test_total_size_setter_initialized(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError SIZE = 123 upload = self._makeOne(_Stream) http = object() @@ -928,7 +928,7 @@ def test_total_size_setter_not_initialized(self): self.assertEqual(upload.total_size, SIZE) def test__set_default_strategy_w_existing_strategy(self): - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD config = _Dummy( resumable_path='/resumable/endpoint', simple_multipart=True, @@ -941,7 +941,7 @@ def test__set_default_strategy_w_existing_strategy(self): self.assertEqual(upload.strategy, RESUMABLE_UPLOAD) def test__set_default_strategy_wo_resumable_path(self): - from gcloud.streaming.transfer import SIMPLE_UPLOAD + from google.cloud.streaming.transfer import SIMPLE_UPLOAD config = _Dummy( resumable_path=None, simple_multipart=True, @@ -953,8 +953,8 @@ def test__set_default_strategy_wo_resumable_path(self): self.assertEqual(upload.strategy, SIMPLE_UPLOAD) def test__set_default_strategy_w_total_size_gt_threshhold(self): - from gcloud.streaming.transfer import RESUMABLE_UPLOAD_THRESHOLD - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD_THRESHOLD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD config = _UploadConfig() request = _Request() upload = self._makeOne( @@ -963,7 +963,7 @@ def test__set_default_strategy_w_total_size_gt_threshhold(self): self.assertEqual(upload.strategy, RESUMABLE_UPLOAD) def test__set_default_strategy_w_body_wo_multipart(self): - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD CONTENT = b'ABCDEFGHIJ' config = _UploadConfig() config.simple_multipart = False @@ -973,7 +973,7 @@ def test__set_default_strategy_w_body_wo_multipart(self): self.assertEqual(upload.strategy, RESUMABLE_UPLOAD) def test__set_default_strategy_w_body_w_multipart_wo_simple_path(self): - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD CONTENT = b'ABCDEFGHIJ' config = _UploadConfig() config.simple_path = None @@ -983,7 +983,7 @@ def test__set_default_strategy_w_body_w_multipart_wo_simple_path(self): self.assertEqual(upload.strategy, RESUMABLE_UPLOAD) def test__set_default_strategy_w_body_w_multipart_w_simple_path(self): - from gcloud.streaming.transfer import SIMPLE_UPLOAD + from google.cloud.streaming.transfer import SIMPLE_UPLOAD CONTENT = b'ABCDEFGHIJ' config = _UploadConfig() request = _Request(body=CONTENT) @@ -1011,7 +1011,7 @@ def test_configure_request_w_invalid_mimetype(self): upload.configure_request(config, request, url_builder) def test_configure_request_w_simple_wo_body(self): - from gcloud.streaming.transfer import SIMPLE_UPLOAD + from google.cloud.streaming.transfer import SIMPLE_UPLOAD CONTENT = b'CONTENT' config = _UploadConfig() request = _Request() @@ -1029,8 +1029,8 @@ def test_configure_request_w_simple_wo_body(self): self.assertEqual(request.loggable_body, '') def test_configure_request_w_simple_w_body(self): - from gcloud._helpers import _to_bytes - from gcloud.streaming.transfer import SIMPLE_UPLOAD + from google.cloud._helpers import _to_bytes + from google.cloud.streaming.transfer import SIMPLE_UPLOAD CONTENT = b'CONTENT' BODY = b'BODY' config = _UploadConfig() @@ -1072,7 +1072,7 @@ def test_configure_request_w_simple_w_body(self): self.assertTrue(b'' in request.loggable_body) def test_configure_request_w_resumable_wo_total_size(self): - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD CONTENT = b'CONTENT' config = _UploadConfig() request = _Request() @@ -1089,7 +1089,7 @@ def test_configure_request_w_resumable_wo_total_size(self): {'X-Upload-Content-Type': self.MIME_TYPE}) def test_configure_request_w_resumable_w_total_size(self): - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD CONTENT = b'CONTENT' LEN = len(CONTENT) config = _UploadConfig() @@ -1109,14 +1109,14 @@ def test_configure_request_w_resumable_w_total_size(self): 'X-Upload-Content-Length': '%d' % (LEN,)}) def test_refresh_upload_state_w_simple_strategy(self): - from gcloud.streaming.transfer import SIMPLE_UPLOAD + from google.cloud.streaming.transfer import SIMPLE_UPLOAD upload = self._makeOne(_Stream()) upload.strategy = SIMPLE_UPLOAD upload.refresh_upload_state() # no-op def test_refresh_upload_state_not_initialized(self): - from gcloud.streaming.exceptions import TransferInvalidError - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD upload = self._makeOne(_Stream()) upload.strategy = RESUMABLE_UPLOAD with self.assertRaises(TransferInvalidError): @@ -1125,8 +1125,8 @@ def test_refresh_upload_state_not_initialized(self): def test_refresh_upload_state_w_OK(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + 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,) @@ -1152,8 +1152,8 @@ def test_refresh_upload_state_w_OK(self): def test_refresh_upload_state_w_CREATED(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + 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,) @@ -1177,10 +1177,10 @@ def test_refresh_upload_state_w_CREATED(self): self.assertTrue(upload._final_response is response) def test_refresh_upload_state_w_RESUME_INCOMPLETE_w_range(self): - from gcloud.streaming import transfer as MUT - from gcloud.streaming.http_wrapper import RESUME_INCOMPLETE + from google.cloud.streaming import transfer as MUT + from google.cloud.streaming.http_wrapper import RESUME_INCOMPLETE from unit_tests._testing import _Monkey - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD CONTENT = b'ABCDEFGHIJ' LEN = len(CONTENT) LAST = 5 @@ -1204,10 +1204,10 @@ def test_refresh_upload_state_w_RESUME_INCOMPLETE_w_range(self): self.assertFalse(upload._final_response is response) def test_refresh_upload_state_w_RESUME_INCOMPLETE_wo_range(self): - from gcloud.streaming import transfer as MUT - from gcloud.streaming.http_wrapper import RESUME_INCOMPLETE + from google.cloud.streaming import transfer as MUT + from google.cloud.streaming.http_wrapper import RESUME_INCOMPLETE from unit_tests._testing import _Monkey - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD CONTENT = b'ABCDEFGHIJ' LEN = len(CONTENT) http = object() @@ -1231,9 +1231,9 @@ def test_refresh_upload_state_w_RESUME_INCOMPLETE_wo_range(self): def test_refresh_upload_state_w_error(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT - from gcloud.streaming.exceptions import HttpError - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + 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() @@ -1272,15 +1272,15 @@ def test_initialize_upload_no_strategy(self): upload.initialize_upload(request, http=object()) def test_initialize_upload_simple_w_http(self): - from gcloud.streaming.transfer import SIMPLE_UPLOAD + from google.cloud.streaming.transfer import SIMPLE_UPLOAD request = _Request() upload = self._makeOne(_Stream()) upload.strategy = SIMPLE_UPLOAD upload.initialize_upload(request, http=object()) # no-op def test_initialize_upload_resumable_already_initialized(self): - from gcloud.streaming.exceptions import TransferInvalidError - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD request = _Request() upload = self._makeOne(_Stream()) upload.strategy = RESUMABLE_UPLOAD @@ -1291,9 +1291,9 @@ def test_initialize_upload_resumable_already_initialized(self): def test_initialize_upload_w_http_resumable_not_initialized_w_error(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT - from gcloud.streaming.exceptions import HttpError - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + 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._makeOne(_Stream()) upload.strategy = RESUMABLE_UPLOAD @@ -1307,8 +1307,8 @@ def test_initialize_upload_w_http_resumable_not_initialized_w_error(self): def test_initialize_upload_w_http_wo_auto_transfer_w_OK(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming import transfer as MUT + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD request = _Request() upload = self._makeOne(_Stream(), auto_transfer=False) upload.strategy = RESUMABLE_UPLOAD @@ -1328,8 +1328,8 @@ def test_initialize_upload_w_http_wo_auto_transfer_w_OK(self): def test_initialize_upload_w_granularity_w_auto_transfer_w_OK(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming import transfer as MUT + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD CONTENT = b'ABCDEFGHIJ' http = object() request = _Request() @@ -1377,14 +1377,14 @@ def test__validate_chunksize_w__server_chunk_granularity_hit(self): upload._validate_chunksize(400) def test_stream_file_w_simple_strategy(self): - from gcloud.streaming.transfer import SIMPLE_UPLOAD + from google.cloud.streaming.transfer import SIMPLE_UPLOAD upload = self._makeOne(_Stream()) upload.strategy = SIMPLE_UPLOAD with self.assertRaises(ValueError): upload.stream_file() def test_stream_file_w_use_chunks_invalid_chunk_size(self): - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD upload = self._makeOne(_Stream(), chunksize=1024) upload.strategy = RESUMABLE_UPLOAD upload._server_chunk_granularity = 100 @@ -1392,8 +1392,8 @@ def test_stream_file_w_use_chunks_invalid_chunk_size(self): upload.stream_file(use_chunks=True) def test_stream_file_not_initialized(self): - from gcloud.streaming.exceptions import TransferInvalidError - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD upload = self._makeOne(_Stream(), chunksize=1024) upload.strategy = RESUMABLE_UPLOAD upload._server_chunk_granularity = 128 @@ -1401,7 +1401,7 @@ def test_stream_file_not_initialized(self): upload.stream_file() def test_stream_file_already_complete_w_unseekable_stream(self): - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD http = object() stream = object() response = object() @@ -1414,8 +1414,8 @@ def test_stream_file_already_complete_w_unseekable_stream(self): self.assertTrue(upload.stream_file() is response) def test_stream_file_already_complete_w_seekable_stream_unsynced(self): - from gcloud.streaming.exceptions import CommunicationError - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.exceptions import CommunicationError + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD CONTENT = b'ABCDEFGHIJ' http = object() stream = _Stream(CONTENT) @@ -1431,7 +1431,7 @@ def test_stream_file_already_complete_w_seekable_stream_unsynced(self): def test_stream_file_already_complete_wo_seekable_method_synced(self): import os - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD CONTENT = b'ABCDEFGHIJ' http = object() stream = _Stream(CONTENT) @@ -1447,7 +1447,7 @@ def test_stream_file_already_complete_wo_seekable_method_synced(self): def test_stream_file_already_complete_w_seekable_method_true_synced(self): import os - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD CONTENT = b'ABCDEFGHIJ' http = object() stream = _StreamWithSeekableMethod(CONTENT, True) @@ -1463,7 +1463,7 @@ def test_stream_file_already_complete_w_seekable_method_true_synced(self): def test_stream_file_already_complete_w_seekable_method_false(self): import os - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + from google.cloud.streaming.transfer import RESUMABLE_UPLOAD CONTENT = b'ABCDEFGHIJ' http = object() stream = _StreamWithSeekableMethod(CONTENT, False) @@ -1480,9 +1480,9 @@ def test_stream_file_already_complete_w_seekable_method_false(self): def test_stream_file_incomplete(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT - from gcloud.streaming.http_wrapper import RESUME_INCOMPLETE - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + 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) @@ -1524,10 +1524,10 @@ def test_stream_file_incomplete(self): def test_stream_file_incomplete_w_transfer_error(self): from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT - from gcloud.streaming.exceptions import CommunicationError - from gcloud.streaming.http_wrapper import RESUME_INCOMPLETE - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + 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) @@ -1562,8 +1562,8 @@ def test_stream_file_incomplete_w_transfer_error(self): def test__send_media_request_wo_error(self): from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT - from gcloud.streaming.http_wrapper import RESUME_INCOMPLETE + 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) @@ -1590,10 +1590,10 @@ def test__send_media_request_wo_error(self): def test__send_media_request_w_error(self): from six.moves import http_client from unit_tests._testing import _Monkey - from gcloud.streaming import transfer as MUT - from gcloud.streaming.exceptions import HttpError - from gcloud.streaming.http_wrapper import RESUME_INCOMPLETE - from gcloud.streaming.transfer import RESUMABLE_UPLOAD + 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() @@ -1629,13 +1629,13 @@ def test__send_media_request_w_error(self): self.assertTrue(second_http is http) def test__send_media_body_not_initialized(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError upload = self._makeOne(_Stream()) with self.assertRaises(TransferInvalidError): upload._send_media_body(0) def test__send_media_body_wo_total_size(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError http = object() upload = self._makeOne(_Stream()) upload._initialize(http, _Request.URL) @@ -1643,7 +1643,7 @@ def test__send_media_body_wo_total_size(self): upload._send_media_body(0) def test__send_media_body_start_lt_total_size(self): - from gcloud.streaming.stream_slice import StreamSlice + from google.cloud.streaming.stream_slice import StreamSlice SIZE = 1234 http = object() stream = _Stream() @@ -1670,7 +1670,7 @@ def test__send_media_body_start_lt_total_size(self): self.assertEqual(end, SIZE) def test__send_media_body_start_eq_total_size(self): - from gcloud.streaming.stream_slice import StreamSlice + from google.cloud.streaming.stream_slice import StreamSlice SIZE = 1234 http = object() stream = _Stream() @@ -1697,7 +1697,7 @@ def test__send_media_body_start_eq_total_size(self): self.assertEqual(end, SIZE) def test__send_chunk_not_initialized(self): - from gcloud.streaming.exceptions import TransferInvalidError + from google.cloud.streaming.exceptions import TransferInvalidError upload = self._makeOne(_Stream()) with self.assertRaises(TransferInvalidError): upload._send_chunk(0) @@ -1756,7 +1756,7 @@ def test__send_chunk_wo_total_size_stream_not_exhausted(self): self.assertEqual(end, CHUNK_SIZE) def test__send_chunk_w_total_size_stream_not_exhausted(self): - from gcloud.streaming.stream_slice import StreamSlice + from google.cloud.streaming.stream_slice import StreamSlice CONTENT = b'ABCDEFGHIJ' SIZE = len(CONTENT) CHUNK_SIZE = SIZE - 5 @@ -1787,7 +1787,7 @@ def test__send_chunk_w_total_size_stream_not_exhausted(self): self.assertEqual(end, CHUNK_SIZE) def test__send_chunk_w_total_size_stream_exhausted(self): - from gcloud.streaming.stream_slice import StreamSlice + from google.cloud.streaming.stream_slice import StreamSlice CONTENT = b'ABCDEFGHIJ' SIZE = len(CONTENT) CHUNK_SIZE = 1000 diff --git a/unit_tests/streaming/test_util.py b/unit_tests/streaming/test_util.py index 346b2bf1893c..6e72cfae07d2 100644 --- a/unit_tests/streaming/test_util.py +++ b/unit_tests/streaming/test_util.py @@ -4,7 +4,7 @@ class Test_calculate_wait_for_retry(unittest.TestCase): def _callFUT(self, *args, **kw): - from gcloud.streaming.util import calculate_wait_for_retry + 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): @@ -23,7 +23,7 @@ def test_w_positive_jitter_gt_max_wait(self): class Test_acceptable_mime_type(unittest.TestCase): def _callFUT(self, *args, **kw): - from gcloud.streaming.util import acceptable_mime_type + from google.cloud.streaming.util import acceptable_mime_type return acceptable_mime_type(*args, **kw) def test_pattern_wo_slash(self): diff --git a/unit_tests/test__helpers.py b/unit_tests/test__helpers.py index 08b2600ce8eb..75d25982ad27 100644 --- a/unit_tests/test__helpers.py +++ b/unit_tests/test__helpers.py @@ -19,7 +19,7 @@ class Test__LocalStack(unittest.TestCase): def _getTargetClass(self): - from gcloud._helpers import _LocalStack + from google.cloud._helpers import _LocalStack return _LocalStack @@ -47,14 +47,14 @@ def test_it(self): class Test__UTC(unittest.TestCase): def _getTargetClass(self): - from gcloud._helpers import _UTC + from google.cloud._helpers import _UTC return _UTC def _makeOne(self): return self._getTargetClass()() def test_module_property(self): - from gcloud import _helpers as MUT + from google.cloud import _helpers as MUT klass = self._getTargetClass() try: import pytz @@ -100,7 +100,7 @@ def test___str__(self): class Test__ensure_tuple_or_list(unittest.TestCase): def _callFUT(self, arg_name, tuple_or_list): - from gcloud._helpers import _ensure_tuple_or_list + from google.cloud._helpers import _ensure_tuple_or_list return _ensure_tuple_or_list(arg_name, tuple_or_list) def test_valid_tuple(self): @@ -127,12 +127,12 @@ def test_invalid_iterable(self): class Test__app_engine_id(unittest.TestCase): def _callFUT(self): - from gcloud._helpers import _app_engine_id + from google.cloud._helpers import _app_engine_id return _app_engine_id() def test_no_value(self): from unit_tests._testing import _Monkey - from gcloud import _helpers + from google.cloud import _helpers with _Monkey(_helpers, app_identity=None): dataset_id = self._callFUT() @@ -140,7 +140,7 @@ def test_no_value(self): def test_value_set(self): from unit_tests._testing import _Monkey - from gcloud import _helpers + from google.cloud import _helpers APP_ENGINE_ID = object() APP_IDENTITY = _AppIdentity(APP_ENGINE_ID) @@ -152,11 +152,11 @@ def test_value_set(self): class Test__file_project_id(unittest.TestCase): def _callFUT(self): - from gcloud._helpers import _file_project_id + from google.cloud._helpers import _file_project_id return _file_project_id() def test_success(self): - from gcloud.environment_vars import CREDENTIALS + from google.cloud.environment_vars import CREDENTIALS from unit_tests._testing import _Monkey from unit_tests._testing import _NamedTemporaryFile @@ -185,11 +185,11 @@ def test_no_environment_variable_set(self): class Test__get_nix_config_path(unittest.TestCase): def _callFUT(self): - from gcloud._helpers import _get_nix_config_path + from google.cloud._helpers import _get_nix_config_path return _get_nix_config_path() def test_it(self): - from gcloud import _helpers as MUT + from google.cloud import _helpers as MUT from unit_tests._testing import _Monkey user_root = 'a' @@ -205,11 +205,11 @@ def test_it(self): class Test__get_windows_config_path(unittest.TestCase): def _callFUT(self): - from gcloud._helpers import _get_windows_config_path + from google.cloud._helpers import _get_windows_config_path return _get_windows_config_path() def test_it(self): - from gcloud import _helpers as MUT + from google.cloud import _helpers as MUT from unit_tests._testing import _Monkey appdata_dir = 'a' @@ -228,11 +228,11 @@ class Test__default_service_project_id(unittest.TestCase): CONFIG_TEMPLATE = '[%s]\n%s = %s\n' def _callFUT(self): - from gcloud._helpers import _default_service_project_id + from google.cloud._helpers import _default_service_project_id return _default_service_project_id() def test_nix(self): - from gcloud import _helpers as MUT + from google.cloud import _helpers as MUT from unit_tests._testing import _Monkey from unit_tests._testing import _NamedTemporaryFile @@ -255,7 +255,7 @@ def mock_get_path(): self.assertEqual(result, project_id) def test_windows(self): - from gcloud import _helpers as MUT + from google.cloud import _helpers as MUT from unit_tests._testing import _Monkey from unit_tests._testing import _NamedTemporaryFile @@ -278,7 +278,7 @@ def mock_get_path(): self.assertEqual(result, project_id) def test_gae(self): - from gcloud import _helpers as MUT + from google.cloud import _helpers as MUT from unit_tests._testing import _Monkey with _Monkey(os, name='not-nt'): @@ -291,12 +291,12 @@ def test_gae(self): class Test__compute_engine_id(unittest.TestCase): def _callFUT(self): - from gcloud._helpers import _compute_engine_id + from google.cloud._helpers import _compute_engine_id return _compute_engine_id() def _monkeyConnection(self, connection): from unit_tests._testing import _Monkey - from gcloud import _helpers + from google.cloud import _helpers def _connection_factory(host, timeout): connection.host = host @@ -328,7 +328,7 @@ def test_socket_raises(self): class Test__get_production_project(unittest.TestCase): def _callFUT(self): - from gcloud._helpers import _get_production_project + from google.cloud._helpers import _get_production_project return _get_production_project() def test_no_value(self): @@ -341,7 +341,7 @@ def test_no_value(self): def test_value_set(self): from unit_tests._testing import _Monkey - from gcloud._helpers import PROJECT + from google.cloud._helpers import PROJECT MOCK_PROJECT = object() environ = {PROJECT: MOCK_PROJECT} @@ -353,13 +353,13 @@ def test_value_set(self): class Test__determine_default_project(unittest.TestCase): def _callFUT(self, project=None): - from gcloud._helpers import _determine_default_project + from google.cloud._helpers import _determine_default_project return _determine_default_project(project=project) def _determine_default_helper(self, prod=None, gae=None, gce=None, file_id=None, srv_id=None, project=None): from unit_tests._testing import _Monkey - from gcloud import _helpers + from google.cloud import _helpers _callers = [] @@ -432,12 +432,12 @@ def test_gce(self): class Test__millis(unittest.TestCase): def _callFUT(self, value): - from gcloud._helpers import _millis + from google.cloud._helpers import _millis return _millis(value) def test_one_second_from_epoch(self): import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC WHEN = datetime.datetime(1970, 1, 1, 0, 0, 1, tzinfo=UTC) self.assertEqual(self._callFUT(WHEN), 1000) @@ -446,7 +446,7 @@ def test_one_second_from_epoch(self): class Test__microseconds_from_datetime(unittest.TestCase): def _callFUT(self, value): - from gcloud._helpers import _microseconds_from_datetime + from google.cloud._helpers import _microseconds_from_datetime return _microseconds_from_datetime(value) def test_it(self): @@ -463,7 +463,7 @@ def test_it(self): class Test__millis_from_datetime(unittest.TestCase): def _callFUT(self, value): - from gcloud._helpers import _millis_from_datetime + from google.cloud._helpers import _millis_from_datetime return _millis_from_datetime(value) def test_w_none(self): @@ -472,8 +472,8 @@ def test_w_none(self): def test_w_utc_datetime(self): import datetime import six - from gcloud._helpers import UTC - from gcloud._helpers import _microseconds_from_datetime + from google.cloud._helpers import UTC + from google.cloud._helpers import _microseconds_from_datetime NOW = datetime.datetime.utcnow().replace(tzinfo=UTC) NOW_MICROS = _microseconds_from_datetime(NOW) @@ -485,8 +485,8 @@ def test_w_utc_datetime(self): def test_w_non_utc_datetime(self): import datetime import six - from gcloud._helpers import _UTC - from gcloud._helpers import _microseconds_from_datetime + from google.cloud._helpers import _UTC + from google.cloud._helpers import _microseconds_from_datetime class CET(_UTC): _tzname = 'CET' @@ -503,8 +503,8 @@ class CET(_UTC): def test_w_naive_datetime(self): import datetime import six - from gcloud._helpers import UTC - from gcloud._helpers import _microseconds_from_datetime + from google.cloud._helpers import UTC + from google.cloud._helpers import _microseconds_from_datetime NOW = datetime.datetime.utcnow() UTC_NOW = NOW.replace(tzinfo=UTC) @@ -518,13 +518,13 @@ def test_w_naive_datetime(self): class Test__datetime_from_microseconds(unittest.TestCase): def _callFUT(self, value): - from gcloud._helpers import _datetime_from_microseconds + from google.cloud._helpers import _datetime_from_microseconds return _datetime_from_microseconds(value) def test_it(self): import datetime - from gcloud._helpers import UTC - from gcloud._helpers import _microseconds_from_datetime + from google.cloud._helpers import UTC + from google.cloud._helpers import _microseconds_from_datetime NOW = datetime.datetime(2015, 7, 29, 17, 45, 21, 123456, tzinfo=UTC) @@ -535,7 +535,7 @@ def test_it(self): class Test__rfc3339_to_datetime(unittest.TestCase): def _callFUT(self, dt_str): - from gcloud._helpers import _rfc3339_to_datetime + from google.cloud._helpers import _rfc3339_to_datetime return _rfc3339_to_datetime(dt_str) def test_w_bogus_zone(self): @@ -554,7 +554,7 @@ def test_w_bogus_zone(self): def test_w_microseconds(self): import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC year = 2009 month = 12 @@ -589,7 +589,7 @@ def test_w_naonseconds(self): class Test__rfc3339_nanos_to_datetime(unittest.TestCase): def _callFUT(self, dt_str): - from gcloud._helpers import _rfc3339_nanos_to_datetime + from google.cloud._helpers import _rfc3339_nanos_to_datetime return _rfc3339_nanos_to_datetime(dt_str) def test_w_bogus_zone(self): @@ -608,7 +608,7 @@ def test_w_bogus_zone(self): def test_w_truncated_nanos(self): import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC year = 2009 month = 12 @@ -637,7 +637,7 @@ def test_w_truncated_nanos(self): def test_w_naonseconds(self): import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC year = 2009 month = 12 @@ -659,12 +659,12 @@ def test_w_naonseconds(self): class Test__datetime_to_rfc3339(unittest.TestCase): def _callFUT(self, *args, **kwargs): - from gcloud._helpers import _datetime_to_rfc3339 + from google.cloud._helpers import _datetime_to_rfc3339 return _datetime_to_rfc3339(*args, **kwargs) @staticmethod def _make_timezone(offset): - from gcloud._helpers import _UTC + from google.cloud._helpers import _UTC class CET(_UTC): _tzname = 'CET' @@ -674,7 +674,7 @@ class CET(_UTC): def test_w_utc_datetime(self): import datetime - from gcloud._helpers import UTC + from google.cloud._helpers import UTC TIMESTAMP = datetime.datetime(2016, 4, 5, 13, 30, 0, tzinfo=UTC) result = self._callFUT(TIMESTAMP, ignore_zone=False) @@ -682,7 +682,7 @@ def test_w_utc_datetime(self): def test_w_non_utc_datetime(self): import datetime - from gcloud._helpers import _UTC + from google.cloud._helpers import _UTC zone = self._make_timezone(offset=datetime.timedelta(hours=-1)) TIMESTAMP = datetime.datetime(2016, 4, 5, 13, 30, 0, tzinfo=zone) @@ -691,7 +691,7 @@ def test_w_non_utc_datetime(self): def test_w_non_utc_datetime_and_ignore_zone(self): import datetime - from gcloud._helpers import _UTC + from google.cloud._helpers import _UTC zone = self._make_timezone(offset=datetime.timedelta(hours=-1)) TIMESTAMP = datetime.datetime(2016, 4, 5, 13, 30, 0, tzinfo=zone) @@ -709,7 +709,7 @@ def test_w_naive_datetime(self): class Test__to_bytes(unittest.TestCase): def _callFUT(self, *args, **kwargs): - from gcloud._helpers import _to_bytes + from google.cloud._helpers import _to_bytes return _to_bytes(*args, **kwargs) def test_with_bytes(self): @@ -736,7 +736,7 @@ def test_with_nonstring_type(self): class Test__bytes_to_unicode(unittest.TestCase): def _callFUT(self, *args, **kwargs): - from gcloud._helpers import _bytes_to_unicode + from google.cloud._helpers import _bytes_to_unicode return _bytes_to_unicode(*args, **kwargs) def test_with_bytes(self): @@ -757,13 +757,13 @@ def test_with_nonstring_type(self): class Test__pb_timestamp_to_datetime(unittest.TestCase): def _callFUT(self, timestamp): - from gcloud._helpers import _pb_timestamp_to_datetime + from google.cloud._helpers import _pb_timestamp_to_datetime return _pb_timestamp_to_datetime(timestamp) def test_it(self): import datetime from google.protobuf.timestamp_pb2 import Timestamp - from gcloud._helpers import UTC + from google.cloud._helpers import UTC # Epoch is midnight on January 1, 1970 ... dt_stamp = datetime.datetime(1970, month=1, day=1, hour=0, @@ -778,7 +778,7 @@ def test_it(self): class Test__pb_timestamp_to_rfc3339(unittest.TestCase): def _callFUT(self, timestamp): - from gcloud._helpers import _pb_timestamp_to_rfc3339 + from google.cloud._helpers import _pb_timestamp_to_rfc3339 return _pb_timestamp_to_rfc3339(timestamp) def test_it(self): @@ -795,13 +795,13 @@ def test_it(self): class Test__datetime_to_pb_timestamp(unittest.TestCase): def _callFUT(self, when): - from gcloud._helpers import _datetime_to_pb_timestamp + from google.cloud._helpers import _datetime_to_pb_timestamp return _datetime_to_pb_timestamp(when) def test_it(self): import datetime from google.protobuf.timestamp_pb2 import Timestamp - from gcloud._helpers import UTC + from google.cloud._helpers import UTC # Epoch is midnight on January 1, 1970 ... dt_stamp = datetime.datetime(1970, month=1, day=1, hour=0, @@ -820,7 +820,7 @@ class Test__name_from_project_path(unittest.TestCase): TEMPLATE = r'projects/(?P\w+)/things/(?P\w+)' def _callFUT(self, path, project, template): - from gcloud._helpers import _name_from_project_path + from google.cloud._helpers import _name_from_project_path return _name_from_project_path(path, project, template) def test_w_invalid_path_length(self): @@ -858,7 +858,7 @@ def test_w_project_passed_as_none(self): class TestMetadataPlugin(unittest.TestCase): def _getTargetClass(self): - from gcloud._helpers import MetadataPlugin + from google.cloud._helpers import MetadataPlugin return MetadataPlugin def _makeOne(self, *args, **kwargs): @@ -894,12 +894,12 @@ def callback(*args): class Test_make_stub(unittest.TestCase): def _callFUT(self, *args, **kwargs): - from gcloud._helpers import make_stub + from google.cloud._helpers import make_stub return make_stub(*args, **kwargs) def test_it(self): from unit_tests._testing import _Monkey - from gcloud import _helpers as MUT + from google.cloud import _helpers as MUT mock_result = object() stub_inputs = [] @@ -972,7 +972,7 @@ def mock_plugin(*args): class Test_exc_to_code(unittest.TestCase): def _callFUT(self, exc): - from gcloud._helpers import exc_to_code + from google.cloud._helpers import exc_to_code return exc_to_code(exc) def test_with_stable(self): diff --git a/unit_tests/test_client.py b/unit_tests/test_client.py index 17e28b32216b..c1a178b5a84a 100644 --- a/unit_tests/test_client.py +++ b/unit_tests/test_client.py @@ -18,7 +18,7 @@ class Test_ClientFactoryMixin(unittest.TestCase): def _getTargetClass(self): - from gcloud.client import _ClientFactoryMixin + from google.cloud.client import _ClientFactoryMixin return _ClientFactoryMixin def test_virtual(self): @@ -38,7 +38,7 @@ def tearDown(self): KLASS._connection_class = self.original_cnxn_class def _getTargetClass(self): - from gcloud.client import Client + from google.cloud.client import Client return Client def _makeOne(self, *args, **kw): @@ -46,7 +46,7 @@ def _makeOne(self, *args, **kw): def test_ctor_defaults(self): from unit_tests._testing import _Monkey - from gcloud import client + from google.cloud import client CREDENTIALS = object() FUNC_CALLS = [] @@ -73,7 +73,7 @@ def test_ctor_explicit(self): def test_from_service_account_json(self): from unit_tests._testing import _Monkey - from gcloud import client + from google.cloud import client KLASS = self._getTargetClass() MOCK_FILENAME = 'foo.path' @@ -93,7 +93,7 @@ def test_from_service_account_json_fail(self): def test_from_service_account_p12(self): from unit_tests._testing import _Monkey - from gcloud import client + from google.cloud import client KLASS = self._getTargetClass() CLIENT_EMAIL = 'phred@example.com' @@ -127,7 +127,7 @@ def tearDown(self): KLASS._connection_class = self.original_cnxn_class def _getTargetClass(self): - from gcloud.client import JSONClient + from google.cloud.client import JSONClient return JSONClient def _makeOne(self, *args, **kw): @@ -135,7 +135,7 @@ def _makeOne(self, *args, **kw): def test_ctor_defaults(self): from unit_tests._testing import _Monkey - from gcloud import client + from google.cloud import client PROJECT = 'PROJECT' CREDENTIALS = object() @@ -162,7 +162,7 @@ def mock_get_credentials(): def test_ctor_missing_project(self): from unit_tests._testing import _Monkey - from gcloud import client + from google.cloud import client FUNC_CALLS = [] diff --git a/unit_tests/test_connection.py b/unit_tests/test_connection.py index ca43388ee354..1549f951a8cd 100644 --- a/unit_tests/test_connection.py +++ b/unit_tests/test_connection.py @@ -18,7 +18,7 @@ class TestConnection(unittest.TestCase): def _getTargetClass(self): - from gcloud.connection import Connection + from google.cloud.connection import Connection return Connection def _makeOne(self, *args, **kw): @@ -69,8 +69,8 @@ def test_http_w_creds(self): def test_user_agent_format(self): from pkg_resources import get_distribution - expected_ua = 'gcloud-python/{0}'.format( - get_distribution('gcloud').version) + expected_ua = 'google-cloud-python/{0}'.format( + get_distribution('google-cloud').version) conn = self._makeOne() self.assertEqual(conn.USER_AGENT, expected_ua) @@ -78,7 +78,7 @@ def test_user_agent_format(self): class TestJSONConnection(unittest.TestCase): def _getTargetClass(self): - from gcloud.connection import JSONConnection + from google.cloud.connection import JSONConnection return JSONConnection def _makeOne(self, *args, **kw): @@ -316,7 +316,7 @@ def test_api_request_w_data(self): self.assertEqual(http._called_with['headers'], expected_headers) def test_api_request_w_404(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound conn = self._makeMockOne() conn._http = _Http( {'status': '404', 'content-type': 'text/plain'}, @@ -325,7 +325,7 @@ def test_api_request_w_404(self): self.assertRaises(NotFound, conn.api_request, 'GET', '/') def test_api_request_w_500(self): - from gcloud.exceptions import InternalServerError + from google.cloud.exceptions import InternalServerError conn = self._makeMockOne() conn._http = _Http( {'status': '500', 'content-type': 'text/plain'}, diff --git a/unit_tests/test_credentials.py b/unit_tests/test_credentials.py index 78fe9c5d2e32..c8e71dd923aa 100644 --- a/unit_tests/test_credentials.py +++ b/unit_tests/test_credentials.py @@ -18,12 +18,12 @@ class Test_get_credentials(unittest.TestCase): def _callFUT(self): - from gcloud import credentials + from google.cloud import credentials return credentials.get_credentials() def test_it(self): from unit_tests._testing import _Monkey - from gcloud import credentials as MUT + from google.cloud import credentials as MUT client = _Client() with _Monkey(MUT, client=client): @@ -36,7 +36,7 @@ def test_it(self): class Test_generate_signed_url(unittest.TestCase): def _callFUT(self, *args, **kwargs): - from gcloud.credentials import generate_signed_url + from google.cloud.credentials import generate_signed_url return generate_signed_url(*args, **kwargs) def _generate_helper(self, response_type=None, response_disposition=None, @@ -45,7 +45,7 @@ def _generate_helper(self, response_type=None, response_disposition=None, from six.moves.urllib.parse import parse_qs from six.moves.urllib.parse import urlsplit from unit_tests._testing import _Monkey - from gcloud import credentials as MUT + from google.cloud import credentials as MUT ENDPOINT = 'http://api.example.com' RESOURCE = '/name/path' @@ -104,7 +104,7 @@ def test_w_custom_fields(self): class Test_generate_signed_url_exception(unittest.TestCase): def test_with_google_credentials(self): import time - from gcloud.credentials import generate_signed_url + from google.cloud.credentials import generate_signed_url RESOURCE = '/name/path' credentials = _GoogleCredentials() @@ -116,7 +116,7 @@ def test_with_google_credentials(self): class Test__get_signed_query_params(unittest.TestCase): def _callFUT(self, credentials, expiration, string_to_sign): - from gcloud.credentials import _get_signed_query_params + from google.cloud.credentials import _get_signed_query_params return _get_signed_query_params(credentials, expiration, string_to_sign) @@ -143,7 +143,7 @@ def test_it(self): class Test__get_expiration_seconds(unittest.TestCase): def _callFUT(self, expiration): - from gcloud.credentials import _get_expiration_seconds + from google.cloud.credentials import _get_expiration_seconds return _get_expiration_seconds(expiration) def _utc_seconds(self, when): @@ -174,7 +174,7 @@ def test_w_naive_datetime(self): def test_w_utc_datetime(self): import datetime - from gcloud._helpers import UTC + 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) @@ -182,7 +182,7 @@ def test_w_utc_datetime(self): def test_w_other_zone_datetime(self): import datetime - from gcloud._helpers import _UTC + from google.cloud._helpers import _UTC class CET(_UTC): _tzname = 'CET' @@ -197,7 +197,7 @@ class CET(_UTC): def test_w_timedelta_seconds(self): import datetime from unit_tests._testing import _Monkey - from gcloud import credentials as MUT + 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) @@ -211,7 +211,7 @@ def test_w_timedelta_seconds(self): def test_w_timedelta_days(self): import datetime from unit_tests._testing import _Monkey - from gcloud import credentials as MUT + 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) diff --git a/unit_tests/test_exceptions.py b/unit_tests/test_exceptions.py index 5794547edbb1..3b99b30c1cdf 100644 --- a/unit_tests/test_exceptions.py +++ b/unit_tests/test_exceptions.py @@ -15,11 +15,11 @@ import unittest -class Test_GCloudError(unittest.TestCase): +class Test_GoogleCloudError(unittest.TestCase): def _getTargetClass(self): - from gcloud.exceptions import GCloudError - return GCloudError + from google.cloud.exceptions import GoogleCloudError + return GoogleCloudError def _makeOne(self, message, errors=()): return self._getTargetClass()(message, errors=errors) @@ -49,12 +49,12 @@ def test_ctor_explicit(self): class Test_make_exception(unittest.TestCase): def _callFUT(self, response, content, error_info=None, use_json=True): - from gcloud.exceptions import make_exception + 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 gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound response = _Response(404) content = b'{"error": {"message": "Not Found"}}' exception = self._callFUT(response, content) @@ -63,7 +63,7 @@ def test_hit_w_content_as_str(self): self.assertEqual(list(exception.errors), []) def test_miss_w_content_as_dict(self): - from gcloud.exceptions import GCloudError + from google.cloud.exceptions import GoogleCloudError ERROR = { 'domain': 'global', 'location': 'test', @@ -74,12 +74,12 @@ def test_miss_w_content_as_dict(self): response = _Response(600) content = {"error": {"message": "Unknown Error", "errors": [ERROR]}} exception = self._callFUT(response, content) - self.assertTrue(isinstance(exception, GCloudError)) + self.assertTrue(isinstance(exception, GoogleCloudError)) self.assertEqual(exception.message, 'Unknown Error') self.assertEqual(list(exception.errors), [ERROR]) def test_html_when_json_expected(self): - from gcloud.exceptions import NotFound + from google.cloud.exceptions import NotFound response = _Response(NotFound.code) content = '404 Not Found' exception = self._callFUT(response, content, use_json=True) diff --git a/unit_tests/test_iterator.py b/unit_tests/test_iterator.py index 5aa67184b876..3cc90a09bb1e 100644 --- a/unit_tests/test_iterator.py +++ b/unit_tests/test_iterator.py @@ -18,7 +18,7 @@ class TestIterator(unittest.TestCase): def _getTargetClass(self): - from gcloud.iterator import Iterator + from google.cloud.iterator import Iterator return Iterator def _makeOne(self, *args, **kw): @@ -175,7 +175,7 @@ def test_get_items_from_response_raises_NotImplementedError(self): class TestMethodIterator(unittest.TestCase): def _getTargetClass(self): - from gcloud.iterator import MethodIterator + from google.cloud.iterator import MethodIterator return MethodIterator def _makeOne(self, *args, **kw): diff --git a/unit_tests/test_operation.py b/unit_tests/test_operation.py index a23f15604fed..da0aa7af11f0 100644 --- a/unit_tests/test_operation.py +++ b/unit_tests/test_operation.py @@ -18,14 +18,14 @@ class Test__compute_type_url(unittest.TestCase): def _callFUT(self, klass, prefix=None): - from gcloud.operation import _compute_type_url + from google.cloud.operation import _compute_type_url if prefix is None: return _compute_type_url(klass) return _compute_type_url(klass, prefix) def test_wo_prefix(self): from google.protobuf.struct_pb2 import Struct - from gcloud.operation import _GOOGLE_APIS_PREFIX + from google.cloud.operation import _GOOGLE_APIS_PREFIX type_url = self._callFUT(Struct) @@ -35,7 +35,7 @@ def test_wo_prefix(self): def test_w_prefix(self): from google.protobuf.struct_pb2 import Struct - PREFIX = 'test.gcloud-python.com' + PREFIX = 'test.google-cloud-python.com' type_url = self._callFUT(Struct, PREFIX) @@ -47,13 +47,13 @@ def test_w_prefix(self): class Test__register_type_url(unittest.TestCase): def _callFUT(self, type_url, klass): - from gcloud.operation import _register_type_url + from google.cloud.operation import _register_type_url _register_type_url(type_url, klass) def test_simple(self): - from gcloud import operation as MUT + from google.cloud import operation as MUT from unit_tests._testing import _Monkey - TYPE_URI = 'testing.gcloud-python.com/testing' + TYPE_URI = 'testing.google-cloud-python.com/testing' klass = object() type_url_map = {} @@ -63,9 +63,9 @@ def test_simple(self): self.assertEqual(type_url_map, {TYPE_URI: klass}) def test_w_same_class(self): - from gcloud import operation as MUT + from google.cloud import operation as MUT from unit_tests._testing import _Monkey - TYPE_URI = 'testing.gcloud-python.com/testing' + TYPE_URI = 'testing.google-cloud-python.com/testing' klass = object() type_url_map = {TYPE_URI: klass} @@ -75,9 +75,9 @@ def test_w_same_class(self): self.assertEqual(type_url_map, {TYPE_URI: klass}) def test_w_conflict(self): - from gcloud import operation as MUT + from google.cloud import operation as MUT from unit_tests._testing import _Monkey - TYPE_URI = 'testing.gcloud-python.com/testing' + TYPE_URI = 'testing.google-cloud-python.com/testing' klass, other = object(), object() type_url_map = {TYPE_URI: other} @@ -93,7 +93,7 @@ class OperationTests(unittest.TestCase): OPERATION_NAME = 'operations/projects/foo/instances/bar/operations/123' def _getTargetClass(self): - from gcloud.operation import Operation + from google.cloud.operation import Operation return Operation def _makeOne(self, *args, **kw): @@ -157,7 +157,7 @@ def test_from_pb_w_metadata_and_kwargs(self): from google.longrunning import operations_pb2 from google.protobuf.any_pb2 import Any from google.protobuf.struct_pb2 import Struct, Value - from gcloud import operation as MUT + from google.cloud import operation as MUT from unit_tests._testing import _Monkey TYPE_URI = 'type.googleapis.com/%s' % (Struct.DESCRIPTOR.full_name,) type_url_map = {TYPE_URI: Struct} diff --git a/unit_tests/translate/test_client.py b/unit_tests/translate/test_client.py index 9fd360614295..233f01aa602d 100644 --- a/unit_tests/translate/test_client.py +++ b/unit_tests/translate/test_client.py @@ -20,15 +20,15 @@ class TestClient(unittest.TestCase): KEY = 'abc-123-my-key' def _getTargetClass(self): - from gcloud.translate.client import Client + from google.cloud.translate.client import Client return Client def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) def test_ctor(self): - from gcloud.translate.connection import Connection - from gcloud.translate.client import ENGLISH_ISO_639 + from google.cloud.translate.connection import Connection + from google.cloud.translate.client import ENGLISH_ISO_639 http = object() client = self._makeOne(self.KEY, http=http) @@ -38,7 +38,7 @@ def test_ctor(self): self.assertEqual(client.target_language, ENGLISH_ISO_639) def test_ctor_non_default(self): - from gcloud.translate.connection import Connection + from google.cloud.translate.connection import Connection http = object() target = 'es' @@ -49,7 +49,7 @@ def test_ctor_non_default(self): self.assertEqual(client.target_language, target) def test_get_languages(self): - from gcloud.translate.client import ENGLISH_ISO_639 + from google.cloud.translate.client import ENGLISH_ISO_639 client = self._makeOne(self.KEY) supported = [ diff --git a/unit_tests/translate/test_connection.py b/unit_tests/translate/test_connection.py index c4c3978ad858..b9a16e01f276 100644 --- a/unit_tests/translate/test_connection.py +++ b/unit_tests/translate/test_connection.py @@ -18,7 +18,7 @@ class TestConnection(unittest.TestCase): def _getTargetClass(self): - from gcloud.translate.connection import Connection + from google.cloud.translate.connection import Connection return Connection def _makeOne(self, *args, **kw): diff --git a/unit_tests/vision/test_client.py b/unit_tests/vision/test_client.py index badc74f63a5c..d7c92b1f63c3 100644 --- a/unit_tests/vision/test_client.py +++ b/unit_tests/vision/test_client.py @@ -16,7 +16,7 @@ import base64 import unittest -from gcloud._helpers import _to_bytes +from google.cloud._helpers import _to_bytes class TestClient(unittest.TestCase): @@ -26,7 +26,7 @@ class TestClient(unittest.TestCase): B64_IMAGE_CONTENT = base64.b64encode(IMAGE_CONTENT) def _getTargetClass(self): - from gcloud.vision.client import Client + from google.cloud.vision.client import Client return Client def _makeOne(self, *args, **kw): @@ -39,9 +39,9 @@ def test_ctor(self): self.assertTrue('annotate' in dir(client)) def test_face_annotation(self): + from google.cloud.vision._fixtures import FACE_DETECTION_RESPONSE - from gcloud.vision._fixtures import FACE_DETECTION_RESPONSE as RETURNED - + RETURNED = FACE_DETECTION_RESPONSE REQUEST = { "requests": [ { @@ -61,7 +61,7 @@ def test_face_annotation(self): client = self._makeOne(project=self.PROJECT, credentials=credentials) client.connection = _Connection(RETURNED) - from gcloud.vision.feature import Feature, FeatureTypes + from google.cloud.vision.feature import Feature, FeatureTypes features = [Feature(feature_type=FeatureTypes.FACE_DETECTION, max_results=3)] @@ -78,14 +78,14 @@ class TestVisionRequest(unittest.TestCase): _IMAGE_CONTENT = _to_bytes('/9j/4QNURXhpZgAASUkq') def _getTargetClass(self): - from gcloud.vision.client import VisionRequest + from google.cloud.vision.client import VisionRequest return VisionRequest def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) def test_make_vision_request(self): - from gcloud.vision.feature import Feature, FeatureTypes + from google.cloud.vision.feature import Feature, FeatureTypes feature = Feature(feature_type=FeatureTypes.FACE_DETECTION, max_results=3) vision_request = self._makeOne(self._IMAGE_CONTENT, feature) diff --git a/unit_tests/vision/test_connection.py b/unit_tests/vision/test_connection.py index 630d39c1c917..95ce26f75fb7 100644 --- a/unit_tests/vision/test_connection.py +++ b/unit_tests/vision/test_connection.py @@ -18,7 +18,7 @@ class TestConnection(unittest.TestCase): def _getTargetClass(self): - from gcloud.vision.connection import Connection + from google.cloud.vision.connection import Connection return Connection def _makeOne(self, *args, **kw): diff --git a/unit_tests/vision/test_feature.py b/unit_tests/vision/test_feature.py index c0a804adc105..224305cd71e3 100644 --- a/unit_tests/vision/test_feature.py +++ b/unit_tests/vision/test_feature.py @@ -17,14 +17,14 @@ class TestFeature(unittest.TestCase): def _getTargetClass(self): - from gcloud.vision.feature import Feature + from google.cloud.vision.feature import Feature return Feature def _makeOne(self, *args, **kw): return self._getTargetClass()(*args, **kw) def test_construct_feature(self): - from gcloud.vision.feature import FeatureTypes + from google.cloud.vision.feature import FeatureTypes feature = self._makeOne(FeatureTypes.LABEL_DETECTION) self.assertEqual(1, feature.max_results) self.assertEqual('LABEL_DETECTION', feature.feature_type) @@ -34,7 +34,7 @@ def test_construct_feature(self): self.assertEqual('FACE_DETECTION', feature.feature_type) def test_feature_as_dict(self): - from gcloud.vision.feature import FeatureTypes + from google.cloud.vision.feature import FeatureTypes feature = self._makeOne(FeatureTypes.FACE_DETECTION, max_results=5) EXPECTED = { 'type': 'FACE_DETECTION', diff --git a/unit_tests/vision/test_image.py b/unit_tests/vision/test_image.py index 0566ecf97fc9..7f7f3a77490c 100644 --- a/unit_tests/vision/test_image.py +++ b/unit_tests/vision/test_image.py @@ -15,7 +15,7 @@ import unittest import base64 -from gcloud._helpers import _to_bytes +from google.cloud._helpers import _to_bytes class TestVisionImage(unittest.TestCase): @@ -25,7 +25,7 @@ class TestVisionImage(unittest.TestCase): _CLIENT_MOCK = {'source': ''} def _getTargetClass(self): - from gcloud.vision.image import Image + from google.cloud.vision.image import Image return Image def _makeOne(self, *args, **kw): @@ -42,7 +42,7 @@ def test_image_source_type_content(self): self.assertEqual(None, image.source) self.assertEqual(_AS_DICT, image.as_dict()) - def test_image_source_type_gcloud_storage(self): + def test_image_source_type_google_cloud_storage(self): image = self._makeOne(self._IMAGE_SOURCE, self._CLIENT_MOCK) _AS_DICT = {