Merge pull request #1890 from satra/fix/configparser

fix: address config parser differences between py2 and 3

Author: satra

nipype/pkg_info.py

@@ -1,15 +1,16 @@
 # -*- coding: utf-8 -*-
 from __future__ import print_function, division, unicode_literals, absolute_import
-from builtins import open
 
 from future import standard_library
 standard_library.install_aliases()
-from configparser import ConfigParser
+import configparser
 
 import os
 import sys
 import subprocess
 
+from .info import VERSION
+
 COMMIT_INFO_FNAME = 'COMMIT_INFO.txt'
 PY3 = sys.version_info[0] >= 3
 
@@ -47,7 +48,10 @@ def pkg_commit_hash(pkg_path):
     pth = os.path.join(pkg_path, COMMIT_INFO_FNAME)
     if not os.path.isfile(pth):
         raise IOError('Missing commit info file %s' % pth)
-    cfg_parser = ConfigParser()
+    if PY3:
+        cfg_parser = configparser.RawConfigParser()
+    else:
+        cfg_parser = configparser.ConfigParser()
     cfg_parser.read(pth)
     archive_subst = cfg_parser.get('commit hash', 'archive_subst_hash')
     if not archive_subst.startswith('$Format'):  # it has been substituted
@@ -91,6 +95,7 @@ def get_pkg_info(pkg_path):
         pkg_path=pkg_path,
         commit_source=src,
         commit_hash=hsh,
+        nipype_version=VERSION,
         sys_version=sys.version,
         sys_executable=sys.executable,
         sys_platform=sys.platform,

setup.py

@@ -60,8 +60,8 @@ class BuildWithCommitInfoCommand(build_py):
     package for an example.
     """
     def run(self):
-        from configparser import ConfigParser
         import subprocess
+        import configparser
 
         build_py.run(self)
         proc = subprocess.Popen('git rev-parse --short HEAD',
@@ -74,7 +74,10 @@ def run(self):
             repo_commit = repo_commit.decode()
 
         # We write the installation commit even if it's empty
-        cfg_parser = ConfigParser()
+        if PY3:
+            cfg_parser = configparser.RawConfigParser()
+        else:
+            cfg_parser = configparser.ConfigParser()
         cfg_parser.read(pjoin('nipype', 'COMMIT_INFO.txt'))
         cfg_parser.set('commit hash', 'install_hash', repo_commit.strip())
         out_pth = pjoin(self.build_lib, 'nipype', 'COMMIT_INFO.txt')