diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-04-30 09:30:05 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-04-30 09:30:05 +0200 |
| commit | b75c3103a700ac65b6cd18f66e2d0a07cfc09797 (patch) | |
| tree | 045df74b6615d2f8505199d5e71d07f40fc4edee /lib/git/objects/utils.py | |
| parent | 69361d96a59381fde0ac34d19df2d4aff05fb9a9 (diff) | |
| parent | b48e4d3aa853687f420dc51969837734b70bfdec (diff) | |
| download | gitpython-b75c3103a700ac65b6cd18f66e2d0a07cfc09797.tar.gz | |
Merge commit 'refs/merge-requests/14' of git://gitorious.org/git-python/mainline into integration
Diffstat (limited to 'lib/git/objects/utils.py')
| -rw-r--r-- | lib/git/objects/utils.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/git/objects/utils.py b/lib/git/objects/utils.py index ec5453f1..4f17b652 100644 --- a/lib/git/objects/utils.py +++ b/lib/git/objects/utils.py @@ -39,7 +39,7 @@ def get_object_type_by_name(object_type_name): # precompiled regex -_re_actor_epoch = re.compile(r'^.+? (.*) (\d+) .*$') +_re_actor_epoch = re.compile(r'^.+? (.*) (\d+) ([+-]\d+).*$') def parse_actor_and_date(line): """ @@ -48,11 +48,11 @@ def parse_actor_and_date(line): author Tom Preston-Werner <tom@mojombo.com> 1191999972 -0700 Returns - [Actor, int_seconds_since_epoch] + [Actor, int_seconds_since_epoch, int_timezone_offset] """ m = _re_actor_epoch.search(line) - actor, epoch = m.groups() - return (Actor._from_string(actor), int(epoch)) + actor, epoch, offset = m.groups() + return (Actor._from_string(actor), int(epoch), -int(float(offset)/100*3600)) |