re-added support for including transactions; depends on 'getmemorypool' patch for...

[p2pool.git] / p2pool / util / deferral.py

diff --git a/p2pool/util/deferral.py b/p2pool/util/deferral.py
index d5901b5..fd53f4e 100644 (file)
--- a/p2pool/util/deferral.py
+++ b/p2pool/util/deferral.py
@@ -140,9 +140,12 @@ class DeferredCacher(object):
         self.backing[key] = value
         defer.returnValue(value)
     
-    def call_now(self, key):
+    _nothing = object()
+    def call_now(self, key, default=_nothing):
         if key in self.waiting:
-            raise NotNowError()
+            if default is not self._nothing:
+                return default
+            raise NotNowError(key)
         
         if key in self.backing:
             return self.backing[key]
@@ -158,4 +161,6 @@ class DeferredCacher(object):
                 fail.printTraceback()
                 print
             self.func(key).addCallback(cb).addErrback(eb)
-            raise NotNowError()
+            if default is not self._nothing:
+                return default
+            raise NotNowError(key)