diff --git a/bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.Git.py b/bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.Git.py
index e2fdf276d92158f186139e68ec563909fa78e6d1..fb47f9b69ae95d41e34201355a5c2a1adfdfdbde 100644
--- a/bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.Git.py
+++ b/bt5/erp5_forge/ModuleComponentTemplateItem/portal_components/module.erp5.Git.py
@@ -211,7 +211,7 @@ class Git(WorkingCopy):
     diff_dict = {}
     if out:
       out = iter(out.split('\ndiff --git '))
-      for stat in out.next().splitlines():
+      for stat in next(out).splitlines():
         stat, path = stat.split()[4:]
         stat_dict[path] = stat
       # Emulate svn output for compatibility with erp5.component.module.DiffUtils
@@ -230,7 +230,7 @@ class Git(WorkingCopy):
     path_dict = dict.fromkeys(self.git('ls-files').splitlines(), '')
     path_dict.update(self._patch_with_raw()[0])
     node_dict = {}
-    path_list = path_dict.keys()
+    path_list = list(path_dict.keys())
     for path in path_list:
       status = path_dict[path]
       parent = os.path.dirname(path)
diff --git a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsDiff.py b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsDiff.py
index 57a54c93207fc70388ad01f2950b9b1e5779b852..b858505896bf704a5d57ffd7aeba13e4dac485c5 100644
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsDiff.py
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_vcs/BusinessTemplate_doVcsDiff.py
@@ -8,11 +8,11 @@ else:
 print('<div style="color: black">')
 
 # XXX: ERP5VCS_doCreateJavaScriptStatus should send lists
-if isinstance(added, basestring):
+if isinstance(added, str):
   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 ''
-if isinstance(removed, basestring):
+if isinstance(removed, str):
   removed = removed != 'none' and filter(None, removed.split(',')) or ()
 
 for f in modified: