8000 PEP8 and pyflakes cleanups. · wulczer/txpostgres@f0ef002 · GitHub
[go: up one dir, main page]

Skip to content

Commit f0ef002

Browse files
committed
PEP8 and pyflakes cleanups.
1 parent ef96725 commit f0ef002

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

test/test_txpostgres.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,16 @@ class FakeReactor(object):
9292
def reset(self):
9393
self.readersAdded = self.writersAdded = 0
9494
self.readersRemoved = self.writersRemoved = 0
95+
9596
def addReader(self, _):
9697
self.readersAdded += 1
98+
9799
def addWriter(self, _):
98100
self.writersAdded += 1
101+
99102
def removeReader(self, _):
100103
self.readersRemoved += 1
104+
101105
def removeWriter(self, _):
102106
self.writersRemoved += 1
103107

@@ -288,36 +292,48 @@ def test_errors(self):
288292
also make connect() return a failure.
289293
"""
290294
conn = txpostgres.Connection()
295+
291296
class BadPollable(object):
297+
292298
def __init__(*args, **kwars):
293299
pass
300+
294301
def poll(self):
295302
raise RuntimeError("booga")
303+
296304
def close(self):
297305
pass
306+
298307
conn.connectionFactory = BadPollable
299308

300309
d = conn.connect()
301310
d = self.assertFailure(d, RuntimeError)
302311
d.addCallback(lambda _: conn.close())
303312

304313
class BadThing(object):
314+
305315
def __init__(*args, **kwargs):
306316
raise RuntimeError("wooga")
317+
307318
def close(self):
308319
pass
320+
309321
conn.connectionFactory = BadThing
310322

311323
d.addCallback(lambda _: conn.connect())
312324
d = self.assertFailure(d, RuntimeError)
313325

314326
class BrokenPollable(object):
327+
315328
def __init__(*args, **kwars):
316329
pass
330+
317331
def poll(self):
318332
return "tee hee hee"
333+
319334
def close(self):
320335
pass
336+
321337
conn.connectionFactory = BrokenPollable
322338

323339
d.addCallback(lambda _: conn.connect())
@@ -719,6 +735,7 @@ def brokenInteraction(c):
719735
return c.execute("boom")
720736
d.addCallback(lambda _: pool.runInteraction(brokenInteraction))
721737
d.addCallback(lambda _: self.fail("No exception"))
738+
722739
def checkErrorAndHotswap(f):
723740
f.trap(txpostgres.RollbackFailed)
724741
e = f.value
@@ -735,6 +752,7 @@ def checkErrorAndHotswap(f):
735752
d = c.connect(user=DB_USER, password=DB_PASS,
736753
host=DB_HOST, database=DB_NAME)
737754
return d.addCallback(lambda c: pool.add(c))
755+
738756
d.addErrback(checkErrorAndHotswap)
739757

740758
d.addCallback(lambda _: defer.gatherResults([

txpostgres/txpostgres.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88
"""
99

1010
import psycopg2
11-
from psycopg2 import extensions
1211
from zope.interface import implements
1312

14-
from twisted.internet import interfaces, reactor, defer
13+
from twisted.internet import interfaces, defer
1514
from twisted.python import failure, log
1615

1716

@@ -30,6 +29,7 @@ class UnexpectedPollResult(Exception):
3029
Polling returned an unexpected result.
3130
"""
3231

32+
3333
class _CancelInProgress(Exception):
3434
"""
3535
A query cancellation is in progress.
@@ -404,17 +404,21 @@ def _runInteraction(self, interaction, *args, **kwargs):
404404
def commitAndPassthrough(ret, cursor):
405405
e = cursor.execute("commit")
406406
return e.addCallback(lambda _: ret)
407+
407408
def rollbackAndPassthrough(f, cursor):
408409
# maybeDeferred in case cursor.execute raises a synchronous
409410
# exception
410411
e = defer.maybeDeferred(cursor.execute, "rollback")
412+
411413
def justPanic(rf):
412414
log.err(rf)
413415
return defer.fail(RollbackFailed(self, f))
416+
414417
# if rollback failed panic
415418
e.addErrback(justPanic)
416419
# reraise the original failure afterwards
417420
return e.addCallback(lambda _: f)
421+
418422
d.addCallback(commitAndPassthrough, c)
419423
d.addErrback(rollbackAndPassthrough, c)
420424
d.addCallback(lambda ret: (c.close(), ret)[1])
@@ -533,7 +537,7 @@ def add(self, connection):
533537
"""
534538
self.connections.add(connection)
535539
self._semaphore.limit += 1
536-
self._semaphore.release() # uuuugh...
540+
self._semaphore.release() # uuuugh...
537541

538542
def _putBackAndPassthrough(self, result, connection):
539543
self.connections.add(connection)

0 commit comments

Comments
 (0)
0