Merge lp:~gz/brz/known_graph_pyx into lp:brz

[Martin Packman]

Update _known_graph_pyx and expect to pass on Python 3

Modernise the cython imports and update set of passing tests to include extension module.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/_known_graph_pyx.pyx'
--- breezy/_known_graph_pyx.pyx	2017-10-28 12:46:54 +0000
+++ breezy/_known_graph_pyx.pyx	2018-07-01 22:25:35 +0000
@@ -22,36 +22,39 @@
 cdef extern from "python-compat.h":
     pass
 
-cdef extern from "Python.h":
-    ctypedef int Py_ssize_t
-    ctypedef struct PyObject:
-        pass
-
-    int PyString_CheckExact(object)
-
-    int PyObject_RichCompareBool(object, object, int)
-    int Py_LT
-
-    int PyTuple_CheckExact(object)
-    object PyTuple_New(Py_ssize_t n)
-    Py_ssize_t PyTuple_GET_SIZE(object t)
-    PyObject * PyTuple_GET_ITEM(object t, Py_ssize_t o)
-    void PyTuple_SET_ITEM(object t, Py_ssize_t o, object v)
-
-    int PyList_CheckExact(object)
-    Py_ssize_t PyList_GET_SIZE(object l)
-    PyObject * PyList_GET_ITEM(object l, Py_ssize_t o)
-    int PyList_SetItem(object l, Py_ssize_t o, object l) except -1
-    int PyList_Append(object l, object v) except -1
-
-    int PyDict_CheckExact(object d)
-    Py_ssize_t PyDict_Size(object d) except -1
-    PyObject * PyDict_GetItem(object d, object k)
-    int PyDict_SetItem(object d, object k, object v) except -1
-    int PyDict_DelItem(object d, object k) except -1
-    int PyDict_Next(object d, Py_ssize_t *pos, PyObject **k, PyObject **v)
-
-    void Py_INCREF(object)
+from cpython.bytes cimport (
+    PyBytes_CheckExact,
+    )
+from cpython.dict cimport (
+    PyDict_CheckExact,
+    PyDict_DelItem,
+    PyDict_GetItem,
+    PyDict_Next,
+    PyDict_SetItem,
+    PyDict_Size,
+    )
+from cpython.list cimport (
+    PyList_Append,
+    PyList_CheckExact,
+    PyList_GET_SIZE,
+    PyList_GET_ITEM,
+    PyList_SetItem,
+    )
+from cpython.object cimport (
+    Py_LT,
+    PyObject,
+    PyObject_RichCompareBool,
+    )
+from cpython.ref cimport (
+    Py_INCREF,
+    )
+from cpython.tuple cimport (
+    PyTuple_CheckExact,
+    PyTuple_GET_SIZE,
+    PyTuple_GET_ITEM,
+    PyTuple_New,
+    PyTuple_SET_ITEM,
+    )
 
 import collections
 import gc
@@ -95,14 +98,14 @@
         def __get__(self):
             if self.parents is None:
                 return None
-            
+
             cdef _KnownGraphNode parent
 
             keys = []
             for parent in self.parents:
                 PyList_Append(keys, parent.key)
             return keys
-    
+
     cdef clear_references(self):
         self.parents = None
         self.children = None
@@ -266,7 +269,9 @@
         - all nodes found will also have child_keys populated with all known
           child keys,
         """
-        cdef PyObject *temp_key, *temp_parent_keys, *temp_node
+        cdef PyObject *temp_key
+        cdef PyObject *temp_parent_keys
+        cdef PyObject *temp_node
         cdef Py_ssize_t pos
         cdef _KnownGraphNode node
         cdef _KnownGraphNode parent_node
@@ -348,7 +353,7 @@
 
         If this fills in a ghost, then the gdfos of all children will be
         updated accordingly.
-        
+
         :param key: The node being added. If this is a duplicate, this is a
             no-op.
         :param parent_keys: The parents of the given node.
@@ -579,7 +584,7 @@
         prefix_tips = {}
         for pos from 0 <= pos < PyList_GET_SIZE(tips):
             node = _get_list_node(tips, pos)
-            if PyString_CheckExact(node.key) or len(node.key) == 1:
+            if PyBytes_CheckExact(node.key) or len(node.key) == 1:
                 prefix = ''
             else:
                 prefix = node.key[0]
@@ -640,29 +645,29 @@
         #       shown a specific impact, yet.
         sorter = _MergeSorter(self, tip_key)
         return sorter.topo_order()
-    
+
     def get_parent_keys(self, key):
         """Get the parents for a key
-        
+
         Returns a list containg the parents keys. If the key is a ghost,
         None is returned. A KeyError will be raised if the key is not in
         the graph.
-        
+
         :param keys: Key to check (eg revision_id)
         :return: A list of parents
         """
-        return self._nodes[key].parent_keys 
+        return self._nodes[key].parent_keys
 
     def get_child_keys(self, key):
         """Get the children for a key
-        
+
         Returns a list containg the children keys. A KeyError will be raised
         if the key is not in the graph.
-        
+
         :param keys: Key to check (eg revision_id)
         :return: A list of children
         """
-        return self._nodes[key].child_keys    
+        return self._nodes[key].child_keys
 
 
 cdef class _MergeSortNode:
@@ -929,7 +934,8 @@
         cdef _MergeSortNode ms_node
         cdef _KnownGraphNode node
         cdef Py_ssize_t pos
-        cdef PyObject *temp_key, *temp_node
+        cdef PyObject *temp_key
+        cdef PyObject *temp_node
 
         # Note: allocating a _MergeSortNode and deallocating it for all nodes
         #       costs approx 8.52ms (21%) of the total runtime

=== modified file 'python3.passing'
--- python3.passing	2018-07-01 21:50:14 +0000
+++ python3.passing	2018-07-01 22:25:35 +0000
@@ -17510,70 +17510,135 @@
 breezy.tests.test_knit.TestStacking.test_iter_lines_added_or_present_in_keys
 breezy.tests.test_knit.TestStacking.test_keys
 breezy.tests.test_knit.TestStacking.test_make_mpdiffs
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_filling_in_ghosts_resets_head_cache(C)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_filling_in_ghosts_resets_head_cache(C-nocache)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_filling_in_ghosts_resets_head_cache(python)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_filling_in_ghosts_resets_head_cache(python-nocache)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_alt_merge(C)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_alt_merge(C-nocache)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_alt_merge(python)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_alt_merge(python-nocache)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_criss_cross(C)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_criss_cross(C-nocache)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_criss_cross(python)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_criss_cross(python-nocache)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_linear(C)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_linear(C-nocache)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_linear(python)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_linear(python-nocache)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_null(C)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_null(C-nocache)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_null(python)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_null(python-nocache)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_one(C)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_one(C-nocache)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_one(python)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_one(python-nocache)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_shortcut(C)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_shortcut(C-nocache)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_shortcut(python)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_shortcut(python-nocache)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_single(C)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_single(C-nocache)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_single(python)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_single(python-nocache)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_two_heads(C)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_two_heads(C-nocache)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_two_heads(python)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_two_heads(python-nocache)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_with_ghost(C)
+breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_with_ghost(C-nocache)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_with_ghost(python)
 breezy.tests.test__known_graph.TestKnownGraphHeads.test_heads_with_ghost(python-nocache)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_dotted_revnos_with_simple_merges(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_dotted_revnos_with_simple_merges(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_end_of_merge_multiple_revisions_merged_at_once(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_end_of_merge_multiple_revisions_merged_at_once(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_end_of_merge_not_last_revision_in_branch(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_end_of_merge_not_last_revision_in_branch(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_ghost(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_ghost(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_graph_cycle(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_graph_cycle(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_lefthand_ghost(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_lefthand_ghost(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_merge_depth_with_nested_merges(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_merge_depth_with_nested_merges(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_merge_sort_empty(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_merge_sort_empty(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_merge_sort_not_empty_no_tip(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_merge_sort_not_empty_no_tip(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_merge_sort_one_revision(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_merge_sort_one_revision(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_merge_sort_race(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_merge_sort_race(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_parallel_root_sequence_numbers_increase_with_merges(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_parallel_root_sequence_numbers_increase_with_merges(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_revnos_are_globally_assigned(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_revnos_are_globally_assigned(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_roots_and_sub_branches_versus_ghosts(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_roots_and_sub_branches_versus_ghosts(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_sequence_numbers_increase_no_merges(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_sequence_numbers_increase_no_merges(python)
+breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_sequence_numbers_increase_with_merges(C)
 breezy.tests.test__known_graph.TestKnownGraphMergeSort.test_sequence_numbers_increase_with_merges(python)
+breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_empty(C)
 breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_empty(python)
+breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_linear(C)
 breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_linear(python)
+breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_mixed_ancestries(C)
 breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_mixed_ancestries(python)
+breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_single(C)
 breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_single(python)
+breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_skip_ghost(C)
 breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_skip_ghost(python)
+breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_skip_mainline_ghost(C)
 breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_skip_mainline_ghost(python)
+breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_stable_sorting(C)
 breezy.tests.test__known_graph.TestKnownGraphStableReverseTopoSort.test_stable_sorting(python)
+breezy.tests.test__known_graph.TestKnownGraph.test_add_existing_node(C)
+breezy.tests.test__known_graph.TestKnownGraph.test_add_existing_node_mismatched_parents(C)
 breezy.tests.test__known_graph.TestKnownGraph.test_add_existing_node_mismatched_parents(python)
 breezy.tests.test__known_graph.TestKnownGraph.test_add_existing_node(python)
+breezy.tests.test__known_graph.TestKnownGraph.test_add_new_root(C)
 breezy.tests.test__known_graph.TestKnownGraph.test_add_new_root(python)
+breezy.tests.test__known_graph.TestKnownGraph.test_add_node_with_ghost_parent(C)
 breezy.tests.test__known_graph.TestKnownGraph.test_add_node_with_ghost_parent(python)
+breezy.tests.test__known_graph.TestKnownGraph.test_add_with_all_ghost_parents(C)
 breezy.tests.test__known_graph.TestKnownGraph.test_add_with_all_ghost_parents(python)
+breezy.tests.test__known_graph.TestKnownGraph.test_children_ancestry1(C)
 breezy.tests.test__known_graph.TestKnownGraph.test_children_ancestry1(python)
+breezy.tests.test__known_graph.TestKnownGraph.test_fill_in_ghost(C)
 breezy.tests.test__known_graph.TestKnownGraph.test_fill_in_ghost(python)
+breezy.tests.test__known_graph.TestKnownGraph.test_gdfo_after_add_node(C)
 breezy.tests.test__known_graph.TestKnownGraph.test_gdfo_after_add_node(python)
+breezy.tests.test__known_graph.TestKnownGraph.test_gdfo_ancestry_1(C)
 breezy.tests.test__known_graph.TestKnownGraph.test_gdfo_ancestry_1(python)
+breezy.tests.test__known_graph.TestKnownGraph.test_gdfo_extended_history_shortcut(C)
 breezy.tests.test__known_graph.TestKnownGraph.test_gdfo_extended_history_shortcut(python)
+breezy.tests.test__known_graph.TestKnownGraph.test_gdfo_feature_branch(C)
 breezy.tests.test__known_graph.TestKnownGraph.test_gdfo_feature_branch(python)
+breezy.tests.test__known_graph.TestKnownGraph.test_gdfo_with_ghost(C)
 breezy.tests.test__known_graph.TestKnownGraph.test_gdfo_with_ghost(python)
+breezy.tests.test__known_graph.TestKnownGraph.test_parent_ancestry1(C)
 breezy.tests.test__known_graph.TestKnownGraph.test_parent_ancestry1(python)
+breezy.tests.test__known_graph.TestKnownGraph.test_parent_with_ghost(C)
 breezy.tests.test__known_graph.TestKnownGraph.test_parent_with_ghost(python)
+breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_1(C)
 breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_1(python)
+breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_cycle_2(C)
 breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_cycle_2(python)
+breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_cycle(C)
 breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_cycle(python)
+breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_cycle_with_tail(C)
 breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_cycle_with_tail(python)
+breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_easy(C)
 breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_easy(python)
+breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_empty(C)
 breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_empty(python)
+breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_ghost_parent(C)
 breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_ghost_parent(python)
+breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_partial(C)
 breezy.tests.test__known_graph.TestKnownGraphTopoSort.test_topo_sort_partial(python)
 breezy.tests.test_lazy_import.TestCanonicalize.test_from_one_import_two
 breezy.tests.test_lazy_import.TestCanonicalize.test_import_one