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.

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

BUG: fix isin for server #1255

Merged
merged 3 commits into from Oct 13, 2015
Merged

Conversation

llllllllll
Copy link
Member

The frozenset couldn't be serialized. This also makes deserialization of the datetime give a timestamp.

@llllllllll llllllllll force-pushed the serialize-frozenset branch 4 times, most recently from 9b6c768 to b97438a Compare September 18, 2015 19:17
@@ -76,6 +76,9 @@ install:
# Install coveralls
- pip install coveralls

# Install pyyaml
- pip install PyYAML
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

remove this line ... i just merged 082d96a which adds this to travis

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cool, btw, have you given any thought to the 2.6 compat question?

@llllllllll llllllllll force-pushed the serialize-frozenset branch 5 times, most recently from 80cf414 to 397b1f0 Compare October 13, 2015 13:11
@llllllllll
Copy link
Member Author

@cpcloud merging on pass.

if not key.startswith('__!'):
return obj

return object_hook._converters[key[3:]](obj[key])
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you write this as key[len('__!'):]? IMO this clarifies what you're doing here

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure

@cpcloud cpcloud added this to the 0.9.0 milestone Oct 13, 2015
llllllllll added a commit that referenced this pull request Oct 13, 2015
@llllllllll llllllllll merged commit 3a0fc77 into blaze:master Oct 13, 2015
@llllllllll llllllllll deleted the serialize-frozenset branch October 13, 2015 16:54
@llllllllll
Copy link
Member Author

This was not the PR I meant to merge I saw the comment in my email about the len pr, Sorry about this!

@llllllllll
Copy link
Member Author

Should I revert or just push the len change?

@cpcloud
Copy link
Member

cpcloud commented Oct 13, 2015

Just push the len change

On Tue, Oct 13, 2015 at 12:55 PM Joe Jevnik notifications@github.com
wrote:

Should I revert or just push the len change?


Reply to this email directly or view it on GitHub
#1255 (comment).

@llllllllll
Copy link
Member Author

Okay. Sorry about that.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants