summaryrefslogtreecommitdiff
path: root/numpy/distutils
diff options
context:
space:
mode:
authorRalf Gommers <ralf.gommers@gmail.com>2015-12-29 14:59:36 +0100
committerRalf Gommers <ralf.gommers@gmail.com>2016-01-16 12:18:25 +0100
commit983eb78b906a7b9a07e8ee300359377e63014fec (patch)
treeb9c17e25babead4a7e3fbf5b9824ef7c63b7571d /numpy/distutils
parentb9f480928551e8ef719e4020206ce3a6298c54ec (diff)
downloadnumpy-983eb78b906a7b9a07e8ee300359377e63014fec.tar.gz
BUG: make distutils.misc_util.is_string recognize unicode.
This was triggered by the numpy version string (which is unicde) being included in metadata. This could also solve other problems for external users of numpy.distutils.
Diffstat (limited to 'numpy/distutils')
-rw-r--r--numpy/distutils/misc_util.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index 345e60f26..79b6f25f3 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -38,6 +38,7 @@ except NameError:
from sets import Set as set
from numpy.distutils.compat import get_exception
+from numpy.compat import basestring
__all__ = ['Configuration', 'get_numpy_include_dirs', 'default_config_dict',
'dict_append', 'appendpath', 'generate_config_py',
@@ -429,7 +430,7 @@ def _get_f90_modules(source):
return modules
def is_string(s):
- return isinstance(s, str)
+ return isinstance(s, basestring)
def all_strings(lst):
"""Return True if all items in lst are string objects. """