diff options
| -rw-r--r-- | numpy/distutils/npy_pkg_config.py | 9 | ||||
| -rw-r--r-- | numpy/distutils/system_info.py | 4 |
2 files changed, 9 insertions, 4 deletions
diff --git a/numpy/distutils/npy_pkg_config.py b/numpy/distutils/npy_pkg_config.py index fed95b921..4f64623ed 100644 --- a/numpy/distutils/npy_pkg_config.py +++ b/numpy/distutils/npy_pkg_config.py @@ -2,7 +2,7 @@ import sys if sys.version_info[0] < 3: from ConfigParser import SafeConfigParser, NoOptionError else: - from configparser import SafeConfigParser, NoOptionError + from configparser import ConfigParser, SafeConfigParser, NoOptionError import re import os import shlex @@ -270,7 +270,12 @@ def parse_config(filename, dirs=None): else: filenames = [filename] - config = SafeConfigParser() + if sys.version[:3] > '3.1': + # SafeConfigParser is deprecated in py-3.2 and renamed to ConfigParser + config = ConfigParser() + else: + config = SafeConfigParser() + n = config.read(filenames) if not len(n) >= 1: raise PkgNotFound("Could not find file(s) %s" % str(filenames)) diff --git a/numpy/distutils/system_info.py b/numpy/distutils/system_info.py index 7d1379981..667ca82bc 100644 --- a/numpy/distutils/system_info.py +++ b/numpy/distutils/system_info.py @@ -117,9 +117,9 @@ import copy import warnings from glob import glob if sys.version_info[0] < 3: - from ConfigParser import SafeConfigParser, NoOptionError, ConfigParser + from ConfigParser import NoOptionError, ConfigParser else: - from configparser import SafeConfigParser, NoOptionError, ConfigParser + from configparser import NoOptionError, ConfigParser from distutils.errors import DistutilsError from distutils.dist import Distribution |