summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartinko2013-09-19 15:28:19 +0000
committermartinko2013-09-19 15:28:19 +0000
commit003f7959f8b466720647d67aaf113ca52f61f53d (patch)
tree4661bb9309250b7ebecae2967106b0eb8f95f706
parent185ced570b0fee134dbf2913f02c9f5d375f1a29 (diff)
python: amendments
-rw-r--r--python/londiste/handlers/dispatch.py6
-rw-r--r--python/pgq/consumer.py3
-rw-r--r--python/pgq/localconsumer.py6
3 files changed, 5 insertions, 10 deletions
diff --git a/python/londiste/handlers/dispatch.py b/python/londiste/handlers/dispatch.py
index 0b02edcd..f17d44a6 100644
--- a/python/londiste/handlers/dispatch.py
+++ b/python/londiste/handlers/dispatch.py
@@ -237,7 +237,7 @@ class DirectLoader(BaseLoader):
'D': skytools.mk_delete_sql}
if self.data:
curs.execute("\n".join(mk_sql[op](row, self.table, self.pkeys)
- for op, row in self.data))
+ for op, row in self.data))
class BaseBulkCollectingLoader(BaseLoader):
@@ -923,9 +923,7 @@ class Dispatcher (ShardHandler):
sql = "select " + func + " (%s, %s, %s)"
self.log.debug("func: %s, args: %s", func, args)
curs.execute(sql, args)
- res = []
- for row in curs.fetchall():
- res.append(row[0])
+ res = [row[0] for row in curs.fetchall()]
if res:
self.log.info("Dropped tables: %s", ", ".join(res))
diff --git a/python/pgq/consumer.py b/python/pgq/consumer.py
index d109f749..b7956853 100644
--- a/python/pgq/consumer.py
+++ b/python/pgq/consumer.py
@@ -16,7 +16,7 @@ EV_DONE = 1
class RetriableEvent(Event):
- """Event which can be retryed
+ """Event which can be retried
Consumer is supposed to tag them after processing.
"""
@@ -128,4 +128,3 @@ class Consumer(BaseConsumer):
"""Tag event for retry. (internal)"""
cx.execute("select pgq.event_retry(%s, %s, %s)",
[batch_id, ev_id, retry_time])
-
diff --git a/python/pgq/localconsumer.py b/python/pgq/localconsumer.py
index ed791ece..e551536f 100644
--- a/python/pgq/localconsumer.py
+++ b/python/pgq/localconsumer.py
@@ -128,8 +128,7 @@ class LocalConsumer(BaseConsumer):
raise Exception('process_local_event not implemented')
def is_batch_done(self):
- """Helper function to keep track of last successful batch
- in external database.
+ """Helper function to keep track of last successful batch in external database.
"""
local_tick = self.load_local_tick()
@@ -154,8 +153,7 @@ class LocalConsumer(BaseConsumer):
prev_tick, cur_tick, local_tick))
def set_batch_done(self):
- """Helper function to set last successful batch
- in external database.
+ """Helper function to set last successful batch in external database.
"""
tick_id = self.batch_info['tick_id']
self.save_local_tick(tick_id)