From 1b8644c4d3537891ba9c90a704975d07f3c5a432 Mon Sep 17 00:00:00 2001 From: Forrest Voight Date: Fri, 28 Dec 2012 11:28:37 -0500 Subject: [PATCH 1/1] fixup to commit 38bda9: refactored jsonrpc... --- p2pool/util/jsonrpc.py | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/p2pool/util/jsonrpc.py b/p2pool/util/jsonrpc.py index 35c1ec6..c124d03 100644 --- a/p2pool/util/jsonrpc.py +++ b/p2pool/util/jsonrpc.py @@ -4,7 +4,7 @@ import json import weakref from twisted.internet import defer -from twisted.python import log +from twisted.python import failure, log from twisted.web import client, error from p2pool.util import deferred_resource, memoize @@ -61,7 +61,7 @@ def _handle(data, provider, preargs=(), response_handler=None): if 'result' in req or 'error' in req: response_handler(req['id'], req['result'] if 'error' not in req or req['error'] is None else - failure.Failure(Error_for_code(resp['error']['code'])(resp['error']['message'], resp['error'].get('data', None)))) + failure.Failure(Error_for_code(req['error']['code'])(req['error']['message'], req['error'].get('data', None)))) defer.returnValue(None) id_ = req.get('id', None) -- 1.7.1