Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

docs: change the documentation for using 'six.moves.collections_abc.Mapping' instead of 'dict' in 'client_options.from_dict()' #53

Merged
merged 2 commits into from Jun 23, 2020
Merged

docs: change the documentation for using 'six.moves.collections_abc.Mapping' instead of 'dict' in 'client_options.from_dict()' #53

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5e46589
docs: change the documentation for using 'six.moves.collections_abc.M…
paul1319 Jun 18, 2020
a55f1bb
Merge branch 'master' into issue_14
paul1319 Jun 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions google/api_core/client_options.py
View file
Open in desktop
Expand Up @@ -33,7 +33,7 @@ def get_client_cert():

client = ImageAnnotatorClient(client_options=options)

You can also pass a dictionary.
You can also pass a mapping object.

.. code-block:: python

Expand Down Expand Up @@ -98,10 +98,10 @@ def __repr__(self):


def from_dict(options):
"""Construct a client options object from a dictionary.
"""Construct a client options object from a mapping object.

Args:
options (Dict[str, Any]): A dictionary with client options.
options (six.moves.collections_abc.Mapping): A mapping object with client options.
See the docstring for ClientOptions for details on valid arguments.
"""

Expand Down