Merge branch 'master' into V9_dev

[tools/configuration.git] / copyright / insert_copyright

diff --git a/copyright/insert_copyright b/copyright/insert_copyright
index b08a80770c7e2de3f2c727ec54cc1928ecd6c9f6..e91ec3ada20b4d2e58c6537b2102e94dc846e6d3 100755 (executable)
--- a/copyright/insert_copyright
+++ b/copyright/insert_copyright
@@ -205,8 +205,14 @@ def autodetect_owner(filename):
         while directory != '/':
             config_file = os.path.join(directory, '.git', 'config')
             if os.path.exists(config_file):
-                from ConfigParser import ConfigParser
-                from StringIO import StringIO
+                try:
+                    from ConfigParser import ConfigParser
+                except ImportError:
+                    from configparser import ConfigParser
+                try:
+                    from StringIO import StringIO
+                except ImportError:
+                    from io import StringIO
                 with open(config_file) as fid:
                     gitcfg = fid.readlines()
                     cfg = ConfigParser()