python/pgq: fixes (event & walker)

diff --git a/python/pgq/consumer.py b/python/pgq/consumer.py
index d109f74925d5e9bbd4e912df8350bc64c3dcc0c8..0d4cee525f5ff5899f50307fd0d72e393f577862 100644 (file)
--- a/python/pgq/consumer.py
+++ b/python/pgq/consumer.py
@@ -20,11 +20,10 @@ class RetriableEvent(Event):
 
     Consumer is supposed to tag them after processing.
     """
-
     __slots__ = ('_status', )
 
     def __init__(self, queue_name, row):
-        super(RetriableEvent, self).__init__(self, queue_name, row)
+        super(RetriableEvent, self).__init__(queue_name, row)
         self._status = EV_DONE
 
     def tag_done(self):
@@ -45,14 +44,17 @@ class RetriableWalkerEvent(RetriableEvent):
     tag_done() events don't need to be remembered.
     """
     __slots__ = ('_walker', )
-    def __init__(self, walker, queue, row):
-        Event.__init__(self, queue, row)
+
+    def __init__(self, walker, queue_name, row):
+        super(RetriableWalkerEvent, self).__init__(queue_name, row)
         self._walker = walker
 
     def tag_done(self):
         self._walker.tag_event_done(self)
+
     def get_status(self):
         self._walker.get_status(self)
+
     def tag_retry(self, retry_time = 60):
         self._walker.tag_event_retry(self, retry_time)
 

diff --git a/python/pgq/event.py b/python/pgq/event.py
index 22e648a11ac6ddc1f2867637590179703f77e898..57838e3d9d71cb5513af7d747e6f4e679a4c770d 100644 (file)
--- a/python/pgq/event.py
+++ b/python/pgq/event.py
@@ -44,7 +44,7 @@ class Event(object):
         return self._event_row[_fldmap[key]]
 
     # would be better in RetriableEvent only since we don't care but
-    # unfortunatelly it needs to be defined here due to compatibility concerns
+    # unfortunately it needs to be defined here due to compatibility concerns
     def tag_done(self):
         pass
 
@@ -58,7 +58,7 @@ class Event(object):
     def items(self): return self._event_row.items()
     def iterkeys(self): return self._event_row.iterkeys()
     def itervalues(self): return self._event_row.itervalues()
+
     def __str__(self):
         return "<id=%d type=%s data=%s e1=%s e2=%s e3=%s e4=%s>" % (
                 self.id, self.type, self.data, self.extra1, self.extra2, self.extra3, self.extra4)
-