merge 0.6 series to trunk.

1 files changed, 6 insertions, 3 deletions

diff --git a/test/base/test_dependency.py b/test/base/test_dependency.py
index 0457d552a..890dd7607 100644
--- a/test/base/test_dependency.py
+++ b/test/base/test_dependency.py
@@ -178,9 +178,12 @@ class DependencySortTest(TestBase):
         self.assert_sort(tuples, head)
 
     def testbigsort(self):
-        tuples = []
-        for i in range(0,1500, 2):
-            tuples.append((i, i+1))
+        tuples = [(i, i + 1) for i in range(0, 1500, 2)]
         head = topological.sort_as_tree(tuples, [])
 
 
+    def testids(self):
+        # ticket:1380 regression: would raise a KeyError
+        topological.sort([(id(i), i) for i in range(3)], [])
+
+