Commit 80c7f34f authored by Jérome Perrin's avatar Jérome Perrin

forge: python3 compatibility for git tab

parent 45d15a2f
...@@ -211,7 +211,7 @@ class Git(WorkingCopy): ...@@ -211,7 +211,7 @@ class Git(WorkingCopy):
diff_dict = {} diff_dict = {}
if out: if out:
out = iter(out.split('\ndiff --git ')) out = iter(out.split('\ndiff --git '))
for stat in out.next().splitlines(): for stat in next(out).splitlines():
stat, path = stat.split()[4:] stat, path = stat.split()[4:]
stat_dict[path] = stat stat_dict[path] = stat
# Emulate svn output for compatibility with erp5.component.module.DiffUtils # Emulate svn output for compatibility with erp5.component.module.DiffUtils
...@@ -230,7 +230,7 @@ class Git(WorkingCopy): ...@@ -230,7 +230,7 @@ class Git(WorkingCopy):
path_dict = dict.fromkeys(self.git('ls-files').splitlines(), '') path_dict = dict.fromkeys(self.git('ls-files').splitlines(), '')
path_dict.update(self._patch_with_raw()[0]) path_dict.update(self._patch_with_raw()[0])
node_dict = {} node_dict = {}
path_list = path_dict.keys() path_list = list(path_dict.keys())
for path in path_list: for path in path_list:
status = path_dict[path] status = path_dict[path]
parent = os.path.dirname(path) parent = os.path.dirname(path)
......
...@@ -8,11 +8,11 @@ else: ...@@ -8,11 +8,11 @@ else:
print('<div style="color: black">') print('<div style="color: black">')
# XXX: ERP5VCS_doCreateJavaScriptStatus should send lists # XXX: ERP5VCS_doCreateJavaScriptStatus should send lists
if isinstance(added, basestring): if isinstance(added, str):
added = added != 'none' and filter(None, added.split(',')) or () added = added != 'none' and filter(None, added.split(',')) or ()
if isinstance(modified, basestring): if isinstance(modified, str):
modified = modified != 'none' and filter(None, modified.split(',')) or '' modified = modified != 'none' and filter(None, modified.split(',')) or ''
if isinstance(removed, basestring): if isinstance(removed, str):
removed = removed != 'none' and filter(None, removed.split(',')) or () removed = removed != 'none' and filter(None, removed.split(',')) or ()
for f in modified: for f in modified:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment