some pylint fixes

diff --git a/p2pool/bitcoin/p2p.py b/p2pool/bitcoin/p2p.py
index 3ec241c..ea66af9 100644 (file)
--- a/p2pool/bitcoin/p2p.py
+++ b/p2pool/bitcoin/p2p.py
@@ -76,7 +76,7 @@ class Protocol(p2protocol.Protocol):
             elif inv['type'] == 'block':
                 self.factory.new_block.happened(inv['hash'])
             else:
-                print 'Unknown inv type', item
+                print 'Unknown inv type', inv
     
     message_getdata = pack.ComposedType([
         ('requests', pack.ListType(pack.ComposedType([

diff --git a/p2pool/data.py b/p2pool/data.py
index b00486f..3409849 100644 (file)
--- a/p2pool/data.py
+++ b/p2pool/data.py
@@ -189,7 +189,7 @@ class Share(object):
         self.other_txs = other_txs
         
         if len(self.share_info['share_data']['coinbase']) > 100:
-            raise ValueError('''coinbase too large! %i bytes''' % (len(self.self.share_data['coinbase']),))
+            raise ValueError('''coinbase too large! %i bytes''' % (len(self.share_info['share_data']['coinbase']),))
         
         if len(merkle_link['branch']) > 16:
             raise ValueError('merkle branch too long!')

diff --git a/p2pool/main.py b/p2pool/main.py
index 24cc047..8d7e001 100644 (file)
--- a/p2pool/main.py
+++ b/p2pool/main.py
@@ -586,7 +586,7 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint):
         log.err(None, 'Fatal error:')
 
 def run():
-    realnets=dict((name, net) for name, net in networks.nets.iteritems() if '_testnet' not in name)
+    realnets = dict((name, net) for name, net in networks.nets.iteritems() if '_testnet' not in name)
     
     parser = fixargparse.FixedArgumentParser(description='p2pool (version %s)' % (p2pool.__version__,), fromfile_prefix_chars='@')
     parser.add_argument('--version', action='version', version=p2pool.__version__)

diff --git a/p2pool/util/deferral.py b/p2pool/util/deferral.py
index a4759a0..3104809 100644 (file)
--- a/p2pool/util/deferral.py
+++ b/p2pool/util/deferral.py
@@ -1,6 +1,7 @@
 from __future__ import division
 
 import itertools
+import random
 import sys
 
 from twisted.internet import defer, reactor

diff --git a/p2pool/util/fixargparse.py b/p2pool/util/fixargparse.py
index 93465e9..582f17e 100644 (file)
--- a/p2pool/util/fixargparse.py
+++ b/p2pool/util/fixargparse.py
@@ -1,6 +1,7 @@
 from __future__ import absolute_import
 
 import argparse
+import sys
 
 
 class FixedArgumentParser(argparse.ArgumentParser):