From 76cbcb3e4970d4e6970e8b4333199881625377ef Mon Sep 17 00:00:00 2001 From: Forrest Voight Date: Wed, 27 Jul 2011 20:42:17 -0400 Subject: [PATCH] import, naming, whitespace cleanup --- p2pool/bitcoin/data.py | 1 - p2pool/main.py | 5 ++--- p2pool/util/memoize.py | 3 +++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/p2pool/bitcoin/data.py b/p2pool/bitcoin/data.py index 1fd550f..667eb4c 100644 --- a/p2pool/bitcoin/data.py +++ b/p2pool/bitcoin/data.py @@ -2,7 +2,6 @@ from __future__ import division import struct import hashlib -import itertools import warnings from . import base58 diff --git a/p2pool/main.py b/p2pool/main.py index ab2ca83..4baf5ec 100644 --- a/p2pool/main.py +++ b/p2pool/main.py @@ -11,7 +11,7 @@ import struct import sys import time -from twisted.internet import defer, reactor, task +from twisted.internet import defer, reactor from twisted.web import server from twisted.python import log @@ -428,7 +428,7 @@ def main(args): # disable for now, for testing impact on stales #factory.new_tx.watch(new_tx) - def new_block(block): + def new_block(block_hash): work_updated.happened() factory.new_block.watch(new_block) @@ -445,7 +445,6 @@ def main(args): log.err() yield defer.DeferredList([flag, deferral.sleep(random.expovariate(1/1))], fireOnOneCallback=True) - @defer.inlineCallbacks def work2_thread(): while True: diff --git a/p2pool/util/memoize.py b/p2pool/util/memoize.py index 5cb07e5..488c234 100644 --- a/p2pool/util/memoize.py +++ b/p2pool/util/memoize.py @@ -18,3 +18,6 @@ def memoize_with_backing(backing, inverse_of=None): return res return b return a + +def memoize(f): + return memoize_with_backing({})(f) -- 1.7.1