From 17e57d06d885affe8a916d4e587d63db361565f0 Mon Sep 17 00:00:00 2001 From: Pearu Peterson Date: Fri, 31 Mar 2006 15:45:57 +0000 Subject: Handle callable data file generators --- numpy/distutils/misc_util.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py index 5b1e199c9..3b7a2d7e1 100644 --- a/numpy/distutils/misc_util.py +++ b/numpy/distutils/misc_util.py @@ -287,7 +287,7 @@ def is_sequence(seq): return True def is_glob_pattern(s): - return '*' in s or '?' is s + return is_string(s) and ('*' in s or '?' is s) def as_list(seq): if is_sequence(seq): @@ -865,7 +865,9 @@ class Configuration(object): raise TypeError,`type(files)` if d is None: - if os.path.isabs(filepat): + if callable(file): + d = '' + elif os.path.isabs(filepat): d = '' else: d = os.path.dirname(filepat) -- cgit v1.2.1