style and import fixes

diff --git a/p2pool/bitcoin/base58.py b/p2pool/bitcoin/base58.py
index daf44c8..6778bb7 100644 (file)
--- a/p2pool/bitcoin/base58.py
+++ b/p2pool/bitcoin/base58.py
@@ -9,4 +9,3 @@ def base58_encode(bindata):
 def base58_decode(b58data):
     b58data2 = b58data.lstrip(base58_alphabet[0])
     return chr(0)*(len(b58data) - len(b58data2)) + bases.natural_to_string(bases.string_to_natural(b58data2, base58_alphabet))
-

diff --git a/p2pool/bitcoin/data.py b/p2pool/bitcoin/data.py
index 972c2aa..ed43c05 100644 (file)
--- a/p2pool/bitcoin/data.py
+++ b/p2pool/bitcoin/data.py
@@ -3,9 +3,7 @@ from __future__ import division
 import hashlib
 import struct
 
-from twisted.internet import defer
-
-from . import base58, skiplists
+from . import base58
 from p2pool.util import bases, math, expiring_dict, memoize, dicts
 import p2pool
 

diff --git a/p2pool/data.py b/p2pool/data.py
index 545b5cb..3c75c84 100644 (file)
--- a/p2pool/data.py
+++ b/p2pool/data.py
@@ -6,7 +6,6 @@ import itertools
 import random
 import time
 import os
-import struct
 
 from twisted.python import log
 

diff --git a/p2pool/main.py b/p2pool/main.py
index 39afeab..32cf490 100644 (file)
--- a/p2pool/main.py
+++ b/p2pool/main.py
@@ -315,7 +315,7 @@ def main(args, net):
                 nodes.add(((yield reactor.resolve(host)), net.P2P_PORT))
             except:
                 log.err(None, 'Error resolving bootstrap node IP:')
-
+        
         if net.NAME == 'litecoin':
             nodes.add(((yield reactor.resolve('liteco.in')), net.P2P_PORT))
         

diff --git a/p2pool/p2p.py b/p2pool/p2p.py
index 8b95081..724ac5b 100644 (file)
--- a/p2pool/p2p.py
+++ b/p2pool/p2p.py
@@ -10,7 +10,7 @@ import p2pool
 from p2pool import data as p2pool_data
 from p2pool.bitcoin import p2p as bitcoin_p2p
 from p2pool.bitcoin import data as bitcoin_data
-from p2pool.util import deferral, variable, dicts
+from p2pool.util import deferral, dicts
 
 class Protocol(bitcoin_p2p.BaseProtocol):
     version = 1