Merge lp:~exarkun/corotwine/standalone-greenlet into lp:corotwine

[Jean-Paul Calderone]

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).

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.

[Christopher Armstrong (radix)]

This looks good. Works on Ubuntu 12.04 with the "python-greenlet" package installed.

review: Approve

=== modified file 'corotwine/__init__.py'
--- corotwine/__init__.py	2008-03-29 21:46:57 +0000
+++ corotwine/__init__.py	2012-01-25 15:29:25 +0000
@@ -1,3 +1,9 @@
 """
 Corotwine, a coroutine-based API for Twisted.
 """
+
+# Expose an alias for the greenlet package in use
+try:
+    from py.magic import greenlet
+except ImportError:
+    from greenlet import greenlet

=== modified file 'corotwine/clock.py'
--- corotwine/clock.py	2008-03-29 21:19:15 +0000
+++ corotwine/clock.py	2012-01-25 15:29:25 +0000
@@ -2,8 +2,7 @@
 Time manipulation for greenlets.
 """
 
-from py.magic import greenlet
-
+from corotwine import greenlet
 from corotwine.protocol import MAIN
 
 def wait(seconds, clock=None):

=== modified file 'corotwine/defer.py'
--- corotwine/defer.py	2009-03-05 21:50:17 +0000
+++ corotwine/defer.py	2012-01-25 15:29:25 +0000
@@ -8,13 +8,12 @@
 """
 
 from corotwine.protocol import MAIN
+from corotwine import greenlet
 
 from twisted.python.failure import Failure
 from twisted.python.util import mergeFunctionMetadata
 from twisted.internet.defer import Deferred
 
-from py.magic import greenlet
-
 
 def blockOn(d):
     """

=== modified file 'corotwine/examples.py'
--- corotwine/examples.py	2008-03-31 02:27:55 +0000
+++ corotwine/examples.py	2012-01-25 15:29:25 +0000
@@ -10,8 +10,7 @@
 
 from corotwine.protocol import gListenTCP, gConnectTCP, LineBuffer
 from corotwine.defer import blockOn, deferredGreenlet
-
-from py.magic import greenlet
+from corotwine import greenlet
 
 
 def echo(transport):

=== modified file 'corotwine/protocol.py'
--- corotwine/protocol.py	2008-03-31 02:27:55 +0000
+++ corotwine/protocol.py	2012-01-25 15:29:25 +0000
@@ -12,7 +12,7 @@
 from twisted.internet.error import ConnectionLost, ConnectionDone
 from twisted.protocols.basic import LineReceiver
 
-from py.magic import greenlet
+from corotwine import greenlet
 
 
 MAIN = greenlet.getcurrent()

=== modified file 'corotwine/test_clock.py'
--- corotwine/test_clock.py	2008-03-29 21:19:15 +0000
+++ corotwine/test_clock.py	2012-01-25 15:29:25 +0000
@@ -4,8 +4,7 @@
 from twisted.trial.unittest import TestCase
 from twisted.internet.task import Clock
 
-from py.magic import greenlet
-
+from corotwine import greenlet
 from corotwine.clock import wait
 
 

=== modified file 'corotwine/test_defer.py'
--- corotwine/test_defer.py	2008-03-29 21:19:15 +0000
+++ corotwine/test_defer.py	2012-01-25 15:29:25 +0000
@@ -1,8 +1,8 @@
 """
 Tests for L{corotwine.defer}.
 """
-from py.magic import greenlet
 
+from corotwine import greenlet
 from corotwine.defer import blockOn, deferredGreenlet
 from corotwine.clock import wait
 

=== modified file 'corotwine/test_protocol.py'
--- corotwine/test_protocol.py	2008-03-31 02:20:47 +0000
+++ corotwine/test_protocol.py	2012-01-25 15:29:25 +0000
@@ -13,8 +13,7 @@
 
 from corotwine.protocol import _GreenletFactory, LineBuffer, gConnectTCP
 from corotwine.clock import wait
-
-from py.magic import greenlet
+from corotwine import greenlet
 
 
 class ServerTests(TestCase):