IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed algorithm test_insert passes now and everything seems to be working fine

Browse Source
This commit is contained in:
Daniel Neuhäuser 2010-08-10 15:22:11 +02:00
parent 549c07bade
commit c614ba995d
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sphinx/versioning.py
View File

@ -67,8 +67,8 @@ def merge_doctrees(old, new, condition):
continue continue
if not merge_node(old_node, new_node): if not merge_node(old_node, new_node):
if old_nodes: if old_nodes:
for i, old_node in enumerate(old_nodes): for i, very_old_node in enumerate(old_nodes):
if merge_node(old_node, new_node): if merge_node(very_old_node, new_node):
del old_nodes[i] del old_nodes[i]
# If the last identified node which has not matched the # If the last identified node which has not matched the
# unidentified node matches the current one, we have to # unidentified node matches the current one, we have to

2
tests/test_versioning.py
View File

@ -78,8 +78,6 @@ def test_deleted_end():
assert original_uids[:-1] == uids assert original_uids[:-1] == uids
def test_insert(): def test_insert():
from nose import SkipTest
raise SkipTest('The algorithm does not work at the moment')
insert = doctrees['versioning/insert'] insert = doctrees['versioning/insert']
new_nodes = list(merge_doctrees(original, insert, is_paragraph)) new_nodes = list(merge_doctrees(original, insert, is_paragraph))
uids = [n.uid for n in insert.traverse(is_paragraph)] uids = [n.uid for n in insert.traverse(is_paragraph)]