removed support for legacy addrs.txt
authorForrest Voight <forrest@forre.st>
Sun, 24 Jun 2012 06:15:42 +0000 (02:15 -0400)
committerForrest Voight <forrest@forre.st>
Sun, 24 Jun 2012 16:38:59 +0000 (12:38 -0400)
p2pool/main.py

index d44db83..6c7f188 100644 (file)
@@ -708,11 +708,6 @@ def main(args, net, datadir_path, merged_urls, worker_endpoint):
                     addrs.update(dict((tuple(k), v) for k, v in json.loads(f.read())))
             except:
                 print >>sys.stderr, 'error parsing addrs'
-        elif os.path.exists(os.path.join(datadir_path, 'addrs.txt')):
-            try:
-                addrs.update(dict(eval(x) for x in open(os.path.join(datadir_path, 'addrs.txt'))))
-            except:
-                print >>sys.stderr, "error reading addrs.txt"
         for addr_df in map(parse, net.BOOTSTRAP_ADDRS):
             try:
                 addr = yield addr_df