Merge branch 'master' of github.com:LinuxCabal/Grafo-TDD

Además, corregí lo de los tabuladores y espacios mixtos

Conflicts:
	Graph.py
	test_Graph.py

Graph.py

@@ -73,12 +73,17 @@ def add_edge(self, e):
         self[v][w] = e
         self[w][v] = e
 
+    def get_edge(self, v1, v2):
+        try:
+            return self[v1][v2]
+        except KeyError:
+            return None
+
     def remove_edge( self, e ):
         v1, v2 = e
         self[v1].pop(v2)
         self[v2].pop(v1)
 
-
 def main(script, *args):
     v = Vertex('v')
     print v

test_Graph.py

@@ -13,6 +13,14 @@ def setUp(self):
         self.e2 = Edge(self.v, self.x)
         self.g = Graph([self.v, self.w ,self.x, self.y],[self.e, self.e2])
 
+    def test_get_edge_not_exist(self):
+        edge = self.g.get_edge(self.v, self.y)
+        self.assertIsNone(edge)
+
+    def test_get_edge_exist(self):
+        edge = self.g.get_edge(self.v, self.w)
+        self.assertEqual(edge, self.e)
+
     def test_remove_edge_is_removed( self ):
         '''
         La prueba checa si el Edge esta por ahi.
@@ -23,6 +31,6 @@ def test_remove_edge_is_removed( self ):
         self.assertIsNone( self.g.get_edge( self.v, self.w ) )
 
 if __name__ == '__main__':
-    suite = unittest.TestSuite()
-    unittest.TextTestRunner(verbosity = 2).run(suite)
     unittest.main()
+
+