diff options
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/clang-format/git-clang-format | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/tools/clang-format/git-clang-format b/tools/clang-format/git-clang-format index 12146bf77c..3d1ba8a3c1 100755 --- a/tools/clang-format/git-clang-format +++ b/tools/clang-format/git-clang-format @@ -345,8 +345,13 @@ def run_clang_format_and_save_to_tree(changed_lines, revision=None, """Run clang-format on each file and save the result to a git tree. Returns the object ID (SHA-1) of the created tree.""" + def iteritems(container): + try: + return container.iteritems() # Python 2 + except AttributeError: + return container.items() # Python 3 def index_info_generator(): - for filename, line_ranges in changed_lines.viewitems(): + for filename, line_ranges in iteritems(changed_lines): if revision: git_metadata_cmd = ['git', 'ls-tree', '%s:%s' % (revision, os.path.dirname(filename)), |