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

cosmetic changes to address #4343 #4376

Merged
merged 1 commit into from
Nov 9, 2017
Merged

cosmetic changes to address #4343 #4376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions datastore/google/cloud/datastore/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,10 +167,10 @@ class Client(ClientWithProject):
>>> client = datastore.Client()

:type project: str
:param project: (optional) The project to pass to proxied API methods.
:param project: (Optional) The project to pass to proxied API methods.

:type namespace: str
:param namespace: (optional) namespace to pass to proxied API methods.
:param namespace: (Optional) namespace to pass to proxied API methods.

:type credentials: :class:`~google.auth.credentials.Credentials`
:param credentials: (Optional) The OAuth2 Credentials to use for this
Expand Down Expand Up @@ -346,9 +346,8 @@ def get_multi(self, keys, missing=None, deferred=None,

:type eventual: bool
:param eventual: (Optional) Defaults to strongly consistent (False).
Setting True will use eventual consistency,
but cannot be used inside a transaction or
will raise ValueError.
Setting True will use eventual consistency, but cannot
be used inside a transaction or will raise ValueError.

:rtype: list of :class:`google.cloud.datastore.entity.Entity`
:returns: The requested entities.
Expand Down
6 changes: 3 additions & 3 deletions datastore/google/cloud/datastore/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@

import datetime
import itertools

from google.protobuf import struct_pb2
from google.type import latlng_pb2
import six

from google.cloud._helpers import _datetime_to_pb_timestamp
Expand All @@ -28,9 +31,6 @@
from google.cloud.datastore.entity import Entity
from google.cloud.datastore.key import Key

from google.protobuf import struct_pb2
from google.type import latlng_pb2


def _get_meaning(value_pb, is_list=False):
"""Get the meaning from a protobuf value.
Expand Down