Don't use deprecated has_key() method

johntyree · johntyree · commit cc783a0f5104 · 2014-02-01T14:03:40.000-06:00
diff --git a/graph_search.py b/graph_search.py
@@ -17,7 +17,7 @@ def find_path(self, start, end, path=[]):
 self.path += [self.start]
 if self.start == self.end:
 return self.path
- if not self.graph.has_key(self.start):
+ if not self.start in self.graph:
 return None
 for node in self.graph[self.start]:
 if node not in self.path:
@@ -33,7 +33,7 @@ def find_all_path(self, start, end, path=[]):
 self.path += [self.start]
 if self.start == self.end:
 return [self.path]
- if not self.graph.has_key(self.start):
+ if not self.start in self.graph:
 return []
 paths = []
 for node in self.graph[self.start]:
@@ -51,7 +51,7 @@ def find_shortest_path(self, start, end, path=[]):
 self.path += [self.start]
 if self.start == self.end:
 return self.path
- if not self.graph.has_key(self.start):
+ if not self.start in self.graph:
 return None
 shortest = None
 for node in self.graph[self.start]:

-Original file line number
+Diff line change
 self.path+= [self.start]
 ifself.start==self.end:
 returnself.path
 -ifnotself.graph.has_key(self.start):
 +ifnotself.startinself.graph:
 returnNone
 fornodeinself.graph[self.start]:
 ifnodenotinself.path:
 self.path+= [self.start]
 ifself.start==self.end:
 return [self.path]
 -ifnotself.graph.has_key(self.start):
 +ifnotself.startinself.graph:
 return []
 paths= []
 fornodeinself.graph[self.start]:
 self.path+= [self.start]
 ifself.start==self.end:
 returnself.path
 -ifnotself.graph.has_key(self.start):
 +ifnotself.startinself.graph:
 returnNone
 shortest=None
 fornodeinself.graph[self.start]: