summaryrefslogtreecommitdiff
path: root/git/objects/util.py
diff options
context:
space:
mode:
authorKostis Anagnostopoulos <ankostis@gmail.com>2016-10-22 12:47:45 +0200
committerKostis Anagnostopoulos <ankostis@gmail.com>2016-10-22 12:47:45 +0200
commita25365fea0ea3b92ba96cc281facd308311def1e (patch)
tree5653a9923aebfc8b53407f8d1ef0d9d6497da081 /git/objects/util.py
parent76ac61a2b4bb10c8434a7d6fc798b115b4b7934d (diff)
parentcaa0ea7a0893fe90ea043843d4e6ad407126d7b8 (diff)
downloadgitpython-a25365fea0ea3b92ba96cc281facd308311def1e.tar.gz
Merge remote-tracking branch 'origin/master' into exp_git_dir
Diffstat (limited to 'git/objects/util.py')
-rw-r--r--git/objects/util.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/git/objects/util.py b/git/objects/util.py
index cbb9fe3c..5c085aec 100644
--- a/git/objects/util.py
+++ b/git/objects/util.py
@@ -270,7 +270,7 @@ class Traversable(object):
def traverse(self, predicate=lambda i, d: True,
prune=lambda i, d: False, depth=-1, branch_first=True,
visit_once=True, ignore_self=1, as_edge=False):
- """:return: iterator yieling of items found when traversing self
+ """:return: iterator yielding of items found when traversing self
:param predicate: f(i,d) returns False if item i at depth d should not be included in the result
@@ -282,7 +282,7 @@ class Traversable(object):
define at which level the iteration should not go deeper
if -1, there is no limit
if 0, you would effectively only get self, the root of the iteration
- i.e. if 1, you would only get the first level of predessessors/successors
+ i.e. if 1, you would only get the first level of predecessors/successors
:param branch_first:
if True, items will be returned branch first, otherwise depth first
@@ -298,7 +298,7 @@ class Traversable(object):
:param as_edge:
if True, return a pair of items, first being the source, second the
- destinatination, i.e. tuple(src, dest) with the edge spanning from
+ destination, i.e. tuple(src, dest) with the edge spanning from
source to destination"""
visited = set()
stack = Deque()
@@ -348,7 +348,7 @@ class Serializable(object):
def _serialize(self, stream):
"""Serialize the data of this object into the given data stream
- :note: a serialized object would ``_deserialize`` into the same objet
+ :note: a serialized object would ``_deserialize`` into the same object
:param stream: a file-like object
:return: self"""
raise NotImplementedError("To be implemented in subclass")