diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2018-03-24 13:45:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-24 13:45:17 +0100 |
| commit | f3265bd8beb017890699d093586126ff8af4a3fe (patch) | |
| tree | ccf02df66dbb979c7f6da6949456902a06aa1b1e /git/index/fun.py | |
| parent | 9f12b26b81a8e7667b2a26a7878e5bc033610ed5 (diff) | |
| parent | 80b038f8d8c7c67c148ebd7a5f7a0cb39541b761 (diff) | |
| download | gitpython-f3265bd8beb017890699d093586126ff8af4a3fe.tar.gz | |
Merge pull request #737 from hugovk/rm-2.6
Drop support for EOL Python 2.6 and 3.3
Diffstat (limited to 'git/index/fun.py')
| -rw-r--r-- | git/index/fun.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git/index/fun.py b/git/index/fun.py index c01a32b8..c8912dd2 100644 --- a/git/index/fun.py +++ b/git/index/fun.py @@ -187,7 +187,7 @@ def read_cache(stream): * content_sha is a 20 byte sha on all cache file contents""" version, num_entries = read_header(stream) count = 0 - entries = dict() + entries = {} read = stream.read tell = stream.tell @@ -236,7 +236,7 @@ def write_tree_from_cache(entries, odb, sl, si=0): :param sl: slice indicating the range we should process on the entries list :return: tuple(binsha, list(tree_entry, ...)) a tuple of a sha and a list of tree entries being a tuple of hexsha, mode, name""" - tree_items = list() + tree_items = [] tree_items_append = tree_items.append ci = sl.start end = sl.stop @@ -295,7 +295,7 @@ def aggressive_tree_merge(odb, tree_shas): :param tree_shas: 1, 2 or 3 trees as identified by their binary 20 byte shas If 1 or two, the entries will effectively correspond to the last given tree If 3 are given, a 3 way merge is performed""" - out = list() + out = [] out_append = out.append # one and two way is the same for us, as we don't have to handle an existing |