Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

py31 support

  • Loading branch information...
commit 3b9e317b6c2aa7b43727316117197703fd17a031 1 parent 37688c4
@benoitc authored
Showing with 4 additions and 4 deletions.
  1. +1 −2  flower/stackless.py
  2. +2 −1  test/test_stackless.py
  3. +1 −1  tox.ini
View
3  flower/stackless.py
@@ -35,7 +35,6 @@ class TaskletExit(Exception):
CoroutineExit = TaskletExit
_global_task_id = 0
-
def _coroutine_getcurrent():
try:
return _tls.current_coroutine
@@ -369,7 +368,7 @@ def bind(self, func):
after it has been run, in order to keep its identity.
Note that a tasklet can only be bound when it doesn't have a frame.
"""
- if not callable(func):
+ if not six.callable(func):
raise TypeError('tasklet function must be a callable')
self.func = func
View
3  test/test_stackless.py
@@ -444,7 +444,8 @@ def test_bomb(self):
b = stackless.bomb(*sys.exc_info())
assert b.type is ZeroDivisionError
if six.PY3:
- assert str(b.value).startswith('division by zero')
+ assert (str(b.value).startswith('division by zero') or
+ str(b.value).startswith('int division'))
else:
assert str(b.value).startswith('integer division')
assert b.traceback is not None
View
2  tox.ini
@@ -2,5 +2,5 @@
envlist = py26, py27, py31, py32
[testenv]
-deps=pytest
+deps=pytest
commands = py.test []
Please sign in to comment.
Something went wrong with that request. Please try again.