Zloop timer updates reflecting czmq updates #10
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@claws did we end up implementing the same feature? |
|
No, I don't think so. My changes are built on top of your recent changes. I think your changes wrapped the timer arg while mine update pyczmq in line with with my recent changes to czmq which allow timers to be cancelled by timer_id. |
|
Ah ok I get it, it says I can't merge this, are you up to date with master? |
|
I thought I was. I'll check and confirm when I get home later. |
|
Yes, there was a merge conflict in tests/test_zloop.py which is now resolved. Tests pass. |
michelp
added a commit
that referenced
this pull request
Nov 22, 2013
Zloop timer updates reflecting czmq updates
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request updates pyczmq to reflect the latest czmq version which has timer related changes. All tests that ran before this change are still running. While I have updated the types.Loop class and test with the same changes it is still segfaulting - as it was before I made this change.