Skip to content

Fix #215: Helper for int and double now work as expected. #216

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

Merged
dhermes merged 4 commits into from
Oct 7, 2014
Merged

Fix #215: Helper for int and double now work as expected. #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
20339a5
Fix #215: Helper for int and double now work as expected.
jgeewax Oct 3, 2014
14613bb
Pinned protobuf at >= 2.5.0.
jgeewax Oct 5, 2014
734bf27
Updated naming of global variable to follow PEP8.
jgeewax Oct 6, 2014
e8123f4
Always cast int and long values to a long when preparing for a request.
jgeewax Oct 7, 2014
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
5 changes: 3 additions & 2 deletions gcloud/datastore/helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from gcloud.datastore.key import Key

INT64 = Int64ValueChecker().CheckValue
INT_VALUE_CHECKER = Int64ValueChecker()


def get_protobuf_attribute_and_value(val):
Expand Down Expand Up @@ -56,7 +56,8 @@ def get_protobuf_attribute_and_value(val):
elif isinstance(val, float):
name, value = 'double', val
elif isinstance(val, (int, long)):
name, value = 'integer', INT64(val)
INT_VALUE_CHECKER.CheckValue(val) # This will raise an exception if invalid.
name, value = 'integer', long(val) # Always cast to a long.
elif isinstance(val, basestring):
name, value = 'string', val

Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
REQUIREMENTS = [
'httplib2',
'oauth2client',
'protobuf',
'protobuf >= 2.5.0',
'pycrypto',
'pyopenssl',
'pytz',
Expand Down