Browse Source

Fix syntax errors in docstrings.

Jelmer Vernooij 12 years ago
parent
commit
61d04e418b
2 changed files with 4 additions and 3 deletions
  1. 2 1
      dulwich/diff_tree.py
  2. 2 2
      dulwich/walk.py

+ 2 - 1
dulwich/diff_tree.py

@@ -228,7 +228,8 @@ def tree_changes_for_merge(store, parent_tree_ids, tree_id,
     :param tree_id: The SHA of the merge tree.
     :param tree_id: The SHA of the merge tree.
     :param rename_detector: RenameDetector object for detecting renames.
     :param rename_detector: RenameDetector object for detecting renames.
 
 
-    :yield: Lists of TreeChange objects, one per conflicted path in the merge.
+    :return: Iterator over lists of TreeChange objects, one per conflicted path
+        in the merge.
 
 
         Each list contains one element per parent, with the TreeChange for that
         Each list contains one element per parent, with the TreeChange for that
         path relative to that parent. An element may be None if it never existed
         path relative to that parent. An element may be None if it never existed

+ 2 - 2
dulwich/walk.py

@@ -341,8 +341,8 @@ def _topo_reorder(entries):
     order, e.g. in commit time order.
     order, e.g. in commit time order.
 
 
     :param entries: An iterable of WalkEntry objects.
     :param entries: An iterable of WalkEntry objects.
-    :yield: WalkEntry objects from entries in FIFO order, except where a parent
+    :return: iterator over WalkEntry objects from entries in FIFO order, except
-        would be yielded before any of its children.
+        where a parent would be yielded before any of its children.
     """
     """
     todo = collections.deque()
     todo = collections.deque()
     pending = {}
     pending = {}