22 files changed, 35 insertions, 31 deletions
diff --git a/CHANGES b/CHANGES
index 19c99f08..66e0a42d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -17,6 +17,10 @@ CHANGES
     They may only be initialized using their binary shas, reference names or revision specs are not allowed anymore.
  * The .data attribute was removed from the Object type, it is only available
    on the Blob type.
+ * For consistency with naming conventions used in sub-modules like gitdb, the following modules have been renamed
+  * git.utils -> git.util
+  * git.errors -> git.exc
+  * git.objects.utils -> git.objects.util
    
 
 0.2 Beta 2
diff --git a/lib/git/__init__.py b/lib/git/__init__.py
index 7860a3c1..5ebeaa7d 100644
--- a/lib/git/__init__.py
+++ b/lib/git/__init__.py
@@ -28,12 +28,12 @@ from git.config import GitConfigParser
 from git.objects import *
 from git.refs import *
 from git.diff import *
-from git.errors import *
+from git.exc import *
 from git.cmd import Git
 from git.repo import Repo
 from git.remote import *
 from git.index import *
-from git.utils import (
+from git.util import (
 						LockFile, 
 						BlockingLockFile, 
 						Stats
diff --git a/lib/git/cmd.py b/lib/git/cmd.py
index e9c1ce24..cd848e05 100644
--- a/lib/git/cmd.py
+++ b/lib/git/cmd.py
@@ -5,8 +5,8 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 
 import os, sys
-from utils import *
-from errors import GitCommandError
+from util import *
+from exc import GitCommandError
 
 from subprocess import (
 							call, 
diff --git a/lib/git/config.py b/lib/git/config.py
index e4af57f0..92d64aea 100644
--- a/lib/git/config.py
+++ b/lib/git/config.py
@@ -13,7 +13,7 @@ import inspect
 import cStringIO
 
 from git.odict import OrderedDict
-from git.utils import LockFile
+from git.util import LockFile
 
 __all__ = ('GitConfigParser', )
 
diff --git a/lib/git/diff.py b/lib/git/diff.py
index 79a0c3c1..788bf238 100644
--- a/lib/git/diff.py
+++ b/lib/git/diff.py
@@ -6,8 +6,8 @@
 
 import re
 from objects.blob import Blob
-from objects.utils import mode_str_to_int 
-from errors import GitCommandError
+from objects.util import mode_str_to_int 
+from exc import GitCommandError
 
 from gitdb.util import hex_to_bin
 	
diff --git a/lib/git/errors.py b/lib/git/exc.py
index 93919d5e..93919d5e 100644
--- a/lib/git/errors.py
+++ b/lib/git/exc.py
diff --git a/lib/git/index/base.py b/lib/git/index/base.py
index 1a8bee93..4b3197a2 100644
--- a/lib/git/index/base.py
+++ b/lib/git/index/base.py
@@ -36,7 +36,7 @@ from util import (
 import git.objects
 import git.diff as diff
 
-from git.errors import (
+from git.exc import (
 							GitCommandError,
 							CheckoutError
 						)
@@ -48,9 +48,9 @@ from git.objects import (
 							Commit,
 						)
 
-from git.objects.utils import Serializable
+from git.objects.util import Serializable
 
-from git.utils import (
+from git.util import (
 							IndexFileSHA1Writer, 
 							LazyMixin, 
 							LockedFD, 
diff --git a/lib/git/index/fun.py b/lib/git/index/fun.py
index cc18c65c..fac559c5 100644
--- a/lib/git/index/fun.py
+++ b/lib/git/index/fun.py
@@ -5,8 +5,8 @@ more versatile
 from stat import S_IFDIR
 from cStringIO import StringIO
 
-from git.utils import IndexFileSHA1Writer
-from git.errors import UnmergedEntriesError
+from git.util import IndexFileSHA1Writer
+from git.exc import UnmergedEntriesError
 from git.objects.fun import (
 								tree_to_stream,
 								traverse_tree_recursive,
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
diff --git a/lib/git/refs.py b/lib/git/refs.py
index c8d67d3f..343a0afb 100644
--- a/lib/git/refs.py
+++ b/lib/git/refs.py
@@ -10,8 +10,8 @@ from objects import (
 						Object, 
 						Commit
 					)
-from objects.utils import get_object_type_by_name
-from utils import (
+from objects.util import get_object_type_by_name
+from util import (
 					LazyMixin, 
 					Iterable, 
 					join_path, 
diff --git a/lib/git/remote.py b/lib/git/remote.py
index 1558eeb3..1598e55a 100644
--- a/lib/git/remote.py
+++ b/lib/git/remote.py
@@ -5,10 +5,10 @@
 # the BSD License: http://www.opensource.org/licenses/bsd-license.php
 """Module implementing a remote object allowing easy access to git remotes"""
 
-from errors import GitCommandError
+from exc import GitCommandError
 from objects import Commit
 
-from git.utils import (
+from git.util import (
 						LazyMixin,
 						Iterable,
 						IterableList
diff --git a/lib/git/repo.py b/lib/git/repo.py
index 2df2cb6c..d9b943cd 100644
--- a/lib/git/repo.py
+++ b/lib/git/repo.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 errors import InvalidGitRepositoryError, NoSuchPathError
+from exc import InvalidGitRepositoryError, NoSuchPathError
 from cmd import Git
 from objects import Actor
 from refs import *
diff --git a/lib/git/utils.py b/lib/git/util.py
index 54c3414e..54c3414e 100644
--- a/lib/git/utils.py
+++ b/lib/git/util.py
diff --git a/test/git/test_base.py b/test/git/test_base.py
index 1b01cda3..938647d0 100644
--- a/test/git/test_base.py
+++ b/test/git/test_base.py
@@ -11,7 +11,7 @@ import os
 from test.testlib import *
 from git import *
 from itertools import chain
-from git.objects.utils import get_object_type_by_name
+from git.objects.util import get_object_type_by_name
 from gitdb.util import hex_to_bin
 import tempfile
 
diff --git a/test/git/test_remote.py b/test/git/test_remote.py
index 9d4da034..f609b683 100644
--- a/test/git/test_remote.py
+++ b/test/git/test_remote.py
@@ -6,7 +6,7 @@
 
 from test.testlib import *
 from git import *
-from git.utils import IterableList
+from git.util import IterableList
 import tempfile
 import shutil
 import os
diff --git a/test/git/test_repo.py b/test/git/test_repo.py
index 6554e737..551140a1 100644
--- a/test/git/test_repo.py
+++ b/test/git/test_repo.py
@@ -7,7 +7,7 @@
 import os, sys
 from test.testlib import *
 from git import *
-from git.utils import join_path_native
+from git.util import join_path_native
 import tempfile
 import shutil
 from cStringIO import StringIO
diff --git a/test/git/test_utils.py b/test/git/test_util.py
index 963e2b55..6453bc19 100644
--- a/test/git/test_utils.py
+++ b/test/git/test_util.py
@@ -8,8 +8,8 @@ import os
 import tempfile
 
 from test.testlib import *
-from git.utils import *
-from git.objects.utils import *
+from git.util import *
+from git.objects.util import *
 from git import *
 from git.cmd import dashify