Merge lp://staging/~exarkun/corotwine/standalone-greenlet into lp://staging/corotwine
| Status: | Merged |
|---|---|
| Approved by: | Christopher Armstrong |
| Approved revision: | 15 |
| Merged at revision: | 15 |
| Proposed branch: | lp://staging/~exarkun/corotwine/standalone-greenlet |
| Merge into: | lp://staging/corotwine |
| Diff against target: |
115 lines (+13/-12) 8 files modified
corotwine/__init__.py (+6/-0) corotwine/clock.py (+1/-2) corotwine/defer.py (+1/-2) corotwine/examples.py (+1/-2) corotwine/protocol.py (+1/-1) corotwine/test_clock.py (+1/-2) corotwine/test_defer.py (+1/-1) corotwine/test_protocol.py (+1/-2) |
| To merge this branch: | bzr merge lp://staging/~exarkun/corotwine/standalone-greenlet |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Christopher Armstrong | Approve | ||
|
Review via email:
|
|||
Commit message
Merge lp:~exarkun/corotwine/standalone-greenlet: Support the standalone 'greenlet' module in addition to the one from py.magic.
Author: exarkun
Reviewer: radix
This change adds a fallback to corotwine to use the "greenlet" library if "py.magic.greenlet" is unavailable. "py.magic.greenlet" appears no longer to be available in recent versions of pylib. The standalone "greenlet" module has the same API and appears to be the same code, split into an independent distribution. PyPy also supports the "greenlet" module (via its own implementation).
Description of the change
This change adds a fallback to corotwine to use the "greenlet" library if "py.magic.greenlet" is unavailable. "py.magic.greenlet" appears no longer to be available in recent versions of pylib. The standalone "greenlet" module has the same API and appears to be the same code, split into an independent distribution. PyPy also supports the "greenlet" module (via its own implementation).
I also centralized the logic for selecting which greenlet library to use, though I'm open to suggestions about better places to put that code.
This looks good. Works on Ubuntu 12.04 with the "python-greenlet" package installed.