Skip to content

Commit 7975f5d

Browse files
committed
Improve style with flake8
1 parent 7c503f4 commit 7975f5d

File tree

2 files changed

+21
-19
lines changed

2 files changed

+21
-19
lines changed

pytest_twisted.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
import greenlet, pytest
2-
from twisted.internet import reactor, defer
1+
import decorator
2+
import greenlet
3+
import pytest
4+
5+
from twisted.internet import defer, reactor
36
from twisted.internet.threads import blockingCallFromThread
47
from twisted.python import failure
5-
from decorator import decorator
68

79
gr_twisted = None
810

@@ -33,7 +35,7 @@ def block_from_thread(d):
3335
return blockingCallFromThread(reactor, lambda x: x, d)
3436

3537

36-
@decorator
38+
@decorator.decorator
3739
def inlineCallbacks(fun, *args, **kw):
3840
return defer.inlineCallbacks(fun)(*args, **kw)
3941

testing/test_basic.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@
66
def test_fail_later(testdir):
77
testdir.makepyfile("""
88
from twisted.internet import reactor, defer
9-
9+
1010
def test_fail():
1111
def doit():
1212
try:
1313
1 / 0
1414
except:
1515
d.errback()
16-
16+
1717
d = defer.Deferred()
1818
reactor.callLater(0.01, doit)
1919
return d
@@ -26,7 +26,7 @@ def doit():
2626
def test_succeed_later(testdir):
2727
testdir.makepyfile("""
2828
from twisted.internet import reactor, defer
29-
29+
3030
def test_succeed():
3131
d = defer.Deferred()
3232
reactor.callLater(0.01, d.callback, 1)
@@ -40,7 +40,7 @@ def test_succeed():
4040
def test_non_deferred(testdir):
4141
testdir.makepyfile("""
4242
from twisted.internet import reactor, defer
43-
43+
4444
def test_succeed():
4545
return 42
4646
""")
@@ -63,13 +63,13 @@ def test_inlineCallbacks(testdir):
6363
testdir.makepyfile("""
6464
from twisted.internet import reactor, defer
6565
import pytest
66-
66+
6767
@pytest.fixture(scope="module",
6868
params=["fs", "imap", "web"])
6969
def foo(request):
7070
return request.param
71-
72-
71+
72+
7373
@pytest.inlineCallbacks
7474
def test_succeed(foo):
7575
yield defer.succeed(foo)
@@ -85,16 +85,16 @@ def test_succeed(foo):
8585
def test_twisted_greenlet(testdir):
8686
testdir.makepyfile("""
8787
import pytest, greenlet
88-
88+
8989
MAIN = None
90-
91-
90+
91+
9292
@pytest.fixture(scope="session", autouse=True)
9393
def set_MAIN(request, twisted_greenlet):
9494
global MAIN
9595
MAIN = twisted_greenlet
96-
97-
96+
97+
9898
def test_MAIN():
9999
assert MAIN is not None
100100
assert MAIN is greenlet.getcurrent()
@@ -109,15 +109,15 @@ def test_blocon_in_hook(testdir):
109109
testdir.makeconftest("""
110110
import pytest
111111
from twisted.internet import reactor, defer
112-
112+
113113
def pytest_configure(config):
114114
d = defer.Deferred()
115115
reactor.callLater(0.01, d.callback, 1)
116116
pytest.blockon(d)
117117
""")
118118
testdir.makepyfile("""
119119
from twisted.internet import reactor, defer
120-
120+
121121
def test_succeed():
122122
d = defer.Deferred()
123123
reactor.callLater(0.01, d.callback, 1)
@@ -155,7 +155,7 @@ def test_fail():
155155
from twisted.internet import reactor
156156
from twisted.internet.defer import inlineCallbacks
157157
from twisted.internet.threads import deferToThread
158-
158+
159159
codes = []
160160
161161
@inlineCallbacks

0 commit comments

Comments
 (0)