diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-06-14 17:25:05 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-06-14 17:25:05 +0200 |
| commit | c9dbf201b4f0b3c2b299464618cb4ecb624d272c (patch) | |
| tree | b0267c9f527682c2c420d00350e98f7e7bbe9969 /lib/git/objects/commit.py | |
| parent | 38b3cfb9b24a108e0720f7a3f8d6355f7e0bb1a9 (diff) | |
| download | gitpython-c9dbf201b4f0b3c2b299464618cb4ecb624d272c.tar.gz | |
Moved small types that had their own module into the utils module
Diffstat (limited to 'lib/git/objects/commit.py')
| -rw-r--r-- | lib/git/objects/commit.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/lib/git/objects/commit.py b/lib/git/objects/commit.py index 3b20e314..f30a6dea 100644 --- a/lib/git/objects/commit.py +++ b/lib/git/objects/commit.py @@ -4,10 +4,12 @@ # 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 Iterable +from git.utils import ( + Iterable, + Stats, + ) + import git.diff as diff -import git.stats as stats -from git.actor import Actor from tree import Tree from gitdb import IStream from cStringIO import StringIO @@ -223,7 +225,7 @@ class Commit(base.Object, Iterable, diff.Diffable, utils.Traversable, utils.Seri text = text2 else: text = self.repo.git.diff(self.parents[0].sha, self.sha, '--', numstat=True) - return stats.Stats._list_from_string(self.repo, text) + return Stats._list_from_string(self.repo, text) @classmethod def _iter_from_process_or_stream(cls, repo, proc_or_stream): @@ -332,8 +334,8 @@ class Commit(base.Object, Iterable, diff.Diffable, utils.Traversable, utils.Seri enc_section, enc_option = cls.conf_encoding.split('.') conf_encoding = cr.get_value(enc_section, enc_option, cls.default_encoding) - author = Actor(author_name, author_email) - committer = Actor(committer_name, committer_email) + author = utils.Actor(author_name, author_email) + committer = utils.Actor(committer_name, committer_email) # CREATE NEW COMMIT |