summaryrefslogtreecommitdiff
path: root/lib/git/objects
diff options
context:
space:
mode:
Diffstat (limited to 'lib/git/objects')
-rw-r--r--lib/git/objects/__init__.py2
-rw-r--r--lib/git/objects/base.py4
-rw-r--r--lib/git/objects/commit.py4
-rw-r--r--lib/git/objects/tag.py2
-rw-r--r--lib/git/objects/tree.py6
-rw-r--r--lib/git/objects/util.py (renamed from lib/git/objects/utils.py)0
6 files changed, 9 insertions, 9 deletions
diff --git a/lib/git/objects/__init__.py b/lib/git/objects/__init__.py
index 209d8b51..85c7e38c 100644
--- a/lib/git/objects/__init__.py
+++ b/lib/git/objects/__init__.py
@@ -8,7 +8,7 @@ from blob import *
from tree import *
from commit import *
from submodule import *
-from utils import Actor
+from util import Actor
__all__ = [ name for name, obj in locals().items()
if not (name.startswith('_') or inspect.ismodule(obj)) ] \ No newline at end of file
diff --git a/lib/git/objects/base.py b/lib/git/objects/base.py
index 97b7898c..d4a46788 100644
--- a/lib/git/objects/base.py
+++ b/lib/git/objects/base.py
@@ -3,8 +3,8 @@
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
-from git.utils import LazyMixin, join_path_native, stream_copy
-from utils import get_object_type_by_name
+from git.util import LazyMixin, join_path_native, stream_copy
+from util import get_object_type_by_name
from gitdb.util import (
hex_to_bin,
bin_to_hex,
diff --git a/lib/git/objects/commit.py b/lib/git/objects/commit.py
index 11263e07..132d794b 100644
--- a/lib/git/objects/commit.py
+++ b/lib/git/objects/commit.py
@@ -4,7 +4,7 @@
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
-from git.utils import (
+from git.util import (
Iterable,
Stats,
)
@@ -17,7 +17,7 @@ import base
from gitdb.util import (
hex_to_bin
)
-from utils import (
+from util import (
Traversable,
Serializable,
get_user_id,
diff --git a/lib/git/objects/tag.py b/lib/git/objects/tag.py
index 702eae35..ea480fc2 100644
--- a/lib/git/objects/tag.py
+++ b/lib/git/objects/tag.py
@@ -6,7 +6,7 @@
""" Module containing all object based types. """
import base
from gitdb.util import hex_to_bin
-from utils import (
+from util import (
get_object_type_by_name,
parse_actor_and_date
)
diff --git a/lib/git/objects/tree.py b/lib/git/objects/tree.py
index 64725128..d6e16a31 100644
--- a/lib/git/objects/tree.py
+++ b/lib/git/objects/tree.py
@@ -3,7 +3,7 @@
#
# This module is part of GitPython and is released under
# the BSD License: http://www.opensource.org/licenses/bsd-license.php
-import utils
+import util
from base import IndexObject
from blob import Blob
@@ -101,7 +101,7 @@ class TreeModifier(object):
#} END mutators
-class Tree(IndexObject, diff.Diffable, utils.Traversable, utils.Serializable):
+class Tree(IndexObject, diff.Diffable, util.Traversable, util.Serializable):
"""Tree objects represent an ordered list of Blobs and other Trees.
``Tree as a list``::
@@ -214,7 +214,7 @@ class Tree(IndexObject, diff.Diffable, utils.Traversable, utils.Serializable):
def traverse( self, predicate = lambda i,d: True,
prune = lambda i,d: False, depth = -1, branch_first=True,
visit_once = False, ignore_self=1 ):
- """For documentation, see utils.Traversable.traverse
+ """For documentation, see util.Traversable.traverse
Trees are set to visit_once = False to gain more performance in the traversal"""
return super(Tree, self).traverse(predicate, prune, depth, branch_first, visit_once, ignore_self)
diff --git a/lib/git/objects/utils.py b/lib/git/objects/util.py
index fd648f09..fd648f09 100644
--- a/lib/git/objects/utils.py
+++ b/lib/git/objects/util.py