diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 19:14:33 +0100 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2015-01-04 19:14:33 +0100 |
| commit | f6aa8d116eb33293c0a9d6d600eb7c32832758b9 (patch) | |
| tree | ee07288965cfd4e8326c57735e94c347ee7dd829 /git/index/fun.py | |
| parent | 3936084cdd336ce7db7d693950e345eeceab93a5 (diff) | |
| download | gitpython-f6aa8d116eb33293c0a9d6d600eb7c32832758b9.tar.gz | |
initial set of adjustments to make (most) imports work.
More to come, especially when it's about strings
Diffstat (limited to 'git/index/fun.py')
| -rw-r--r-- | git/index/fun.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/git/index/fun.py b/git/index/fun.py index eec90519..004f992e 100644 --- a/git/index/fun.py +++ b/git/index/fun.py @@ -12,7 +12,7 @@ from stat import ( S_IFGITLINK = S_IFLNK | S_IFDIR # a submodule -from cStringIO import StringIO +from io import StringIO from git.util import IndexFileSHA1Writer from git.exc import UnmergedEntriesError @@ -22,7 +22,7 @@ from git.objects.fun import ( traverse_trees_recursive ) -from typ import ( +from .typ import ( BaseIndexEntry, IndexEntry, CE_NAMEMASK, @@ -30,7 +30,7 @@ from typ import ( ) CE_NAMEMASK_INV = ~CE_NAMEMASK -from util import ( +from .util import ( pack, unpack ) @@ -49,7 +49,7 @@ def stat_mode_to_index_mode(mode): return S_IFLNK if S_ISDIR(mode) or S_IFMT(mode) == S_IFGITLINK: # submodules return S_IFGITLINK - return S_IFREG | 0644 | (mode & 0100) # blobs with or without executable bit + return S_IFREG | 0o644 | (mode & 0o100) # blobs with or without executable bit def write_cache(entries, stream, extension_data=None, ShaStreamCls=IndexFileSHA1Writer): |