← Back to branch summary

~ubuntu-branches/ubuntu/utopic/python-eventlet/utopic

« back to all changes in this revision

Viewing changes to eventlet/hubs/twistedr.py

  • Committer: Bazaar Package Importer
  • Author(s): Soren Hansen
  • Date: 2010-09-28 21:20:32 UTC
  • mfrom: (1.1.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20100928212032-c4n67olxdoqzygmt
Tags: 0.9.12-0ubuntu1
https://launchpad.net/bugs/645899
New upstream release. (FFe: LP: #645899)

Show diffs side-by-side

added added

removed removed

Lines of Context:
eventlet/hubs/twistedr.py
1
1
import sys
2
2
import threading
3
3
from twisted.internet.base import DelayedCall as TwistedDelayedCall
4
 
from eventlet import getcurrent, greenlet
 
4
from eventlet.support import greenlets as greenlet
5
5
from eventlet.hubs.hub import FdListener, READ, WRITE
6
6
 
7
7
class DelayedCall(TwistedDelayedCall):
16
16
class LocalDelayedCall(DelayedCall):
17
17
 
18
18
    def __init__(self, *args, **kwargs):
19
 
        self.greenlet = getcurrent()
 
19
        self.greenlet = greenlet.getcurrent()
20
20
        DelayedCall.__init__(self, *args, **kwargs)
21
21
 
22
22
    def _get_cancelled(self):
103
103
        self.greenlet = mainloop_greenlet
104
104
 
105
105
    def switch(self):
106
 
        assert getcurrent() is not self.greenlet, \
 
106
        assert greenlet.getcurrent() is not self.greenlet, \
107
107
               "Cannot switch from MAINLOOP to MAINLOOP"
108
108
        try:
109
 
           getcurrent().parent = self.greenlet
 
109
           greenlet.getcurrent().parent = self.greenlet
110
110
        except ValueError:
111
111
           pass
112
112
        return self.greenlet.switch()
201
201
        BaseTwistedHub.__init__(self, g)
202
202
 
203
203
    def switch(self):
204
 
        assert getcurrent() is not self.greenlet, \
 
204
        assert greenlet.getcurrent() is not self.greenlet, \
205
205
               "Cannot switch from MAINLOOP to MAINLOOP"
206
206
        if self.greenlet.dead:
207
207
            self.greenlet = greenlet.greenlet(self.run)
208
208
        try:
209
 
            getcurrent().parent = self.greenlet
 
209
            greenlet.getcurrent().parent = self.greenlet
210
210
        except ValueError:
211
211
            pass
212
212
        return self.greenlet.switch()