From ae7a90926be5e07ac430f8c4d11f43244795de91 Mon Sep 17 00:00:00 2001
From: Brian Muller <bamuller@gmail.com>
Date: Sun, 4 Jan 2015 14:40:52 -0500
Subject: [PATCH] fixed default storage culling bug, linted, bumped version to
 0.4

---
 kademlia/__init__.py           | 2 +-
 kademlia/network.py            | 4 ++--
 kademlia/node.py               | 4 ++--
 kademlia/routing.py            | 2 +-
 kademlia/storage.py            | 2 +-
 kademlia/tests/test_routing.py | 3 +--
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/kademlia/__init__.py b/kademlia/__init__.py
index 9854074..1ff5727 100644
--- a/kademlia/__init__.py
+++ b/kademlia/__init__.py
@@ -3,5 +3,5 @@ Kademlia is a Python implementation of the Kademlia protocol for U{Twisted <http
 
 @author: Brian Muller U{bamuller@gmail.com}
 """
-version_info = (0, 3)
+version_info = (0, 4)
 version = '.'.join(map(str, version_info))
diff --git a/kademlia/network.py b/kademlia/network.py
index a8af760..858b380 100644
--- a/kademlia/network.py
+++ b/kademlia/network.py
@@ -187,7 +187,7 @@ class Server(object):
         """
         Load the state of this node (the alpha/ksize/id/immediate neighbors)
         from a cache file with the given fname.
-        """        
+        """
         with open(fname, 'r') as f:
             data = pickle.load(f)
         s = Server(data['ksize'], data['alpha'], data['id'])
@@ -199,7 +199,7 @@ class Server(object):
         """
         Save the state of node with a given regularity to the given
         filename.
-        
+
         @param fname: File to save retularly to
         @param frequencey: Frequency in seconds that the state
         should be saved.  By default, 10 minutes.
diff --git a/kademlia/node.py b/kademlia/node.py
index 4057f1d..6d90493 100644
--- a/kademlia/node.py
+++ b/kademlia/node.py
@@ -60,7 +60,7 @@ class NodeHeap(object):
             return
         nheap = []
         for distance, node in self.heap:
-            if not node.id in peerIDs:
+            if node.id not in peerIDs:
                 heapq.heappush(nheap, (distance, node))
         self.heap = nheap
 
@@ -105,4 +105,4 @@ class NodeHeap(object):
         return iter(map(itemgetter(1), nodes))
 
     def getUncontacted(self):
-        return [n for n in self if not n.id in self.contacted]
+        return [n for n in self if n.id not in self.contacted]
diff --git a/kademlia/routing.py b/kademlia/routing.py
index e445f1d..d8860f9 100644
--- a/kademlia/routing.py
+++ b/kademlia/routing.py
@@ -30,7 +30,7 @@ class KBucket(object):
         return (one, two)
 
     def removeNode(self, node):
-        if not node.id in self.nodes:
+        if node.id not in self.nodes:
             return
 
         # delete node, and see if we can add a replacement
diff --git a/kademlia/storage.py b/kademlia/storage.py
index c76d70e..3cc5e5e 100644
--- a/kademlia/storage.py
+++ b/kademlia/storage.py
@@ -58,7 +58,7 @@ class ForgetfulStorage(object):
 
     def cull(self):
         for k, v in self.iteritemsOlderThan(self.ttl):
-            self.data.popitem(first=True)
+            self.data.popitem(last=False)
 
     def get(self, key, default=None):
         self.cull()
diff --git a/kademlia/tests/test_routing.py b/kademlia/tests/test_routing.py
index ecaf1ae..460302a 100644
--- a/kademlia/tests/test_routing.py
+++ b/kademlia/tests/test_routing.py
@@ -1,7 +1,6 @@
 from twisted.trial import unittest
 
-from kademlia.routing import KBucket, RoutingTable
-from kademlia.protocol import KademliaProtocol
+from kademlia.routing import KBucket
 from kademlia.tests.utils import mknode, FakeProtocol