diff --git a/sphinx/versioning.py b/sphinx/versioning.py index 9ba7e3f78..5806e971b 100644 --- a/sphinx/versioning.py +++ b/sphinx/versioning.py @@ -67,8 +67,8 @@ def merge_doctrees(old, new, condition): continue if not merge_node(old_node, new_node): if old_nodes: - for i, old_node in enumerate(old_nodes): - if merge_node(old_node, new_node): + for i, very_old_node in enumerate(old_nodes): + if merge_node(very_old_node, new_node): del old_nodes[i] # If the last identified node which has not matched the # unidentified node matches the current one, we have to diff --git a/tests/test_versioning.py b/tests/test_versioning.py index 19ef89040..47c322bb6 100644 --- a/tests/test_versioning.py +++ b/tests/test_versioning.py @@ -78,8 +78,6 @@ def test_deleted_end(): assert original_uids[:-1] == uids def test_insert(): - from nose import SkipTest - raise SkipTest('The algorithm does not work at the moment') insert = doctrees['versioning/insert'] new_nodes = list(merge_doctrees(original, insert, is_paragraph)) uids = [n.uid for n in insert.traverse(is_paragraph)]