summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Kern <robert.kern@gmail.com>2007-05-22 00:54:42 +0000
committerRobert Kern <robert.kern@gmail.com>2007-05-22 00:54:42 +0000
commit887f06b7dd0785be3a0eefcc65dda5d818f7002f (patch)
tree2d8618277f2a0fa3dfe39a0ff6db70c0c2ca717c
parent3484afac1ecbc0621a8c7baf16c987214630c9be (diff)
downloadnumpy-887f06b7dd0785be3a0eefcc65dda5d818f7002f.tar.gz
Be robust when the shared distribution object exists does not have data_files set. This can happen when easy_install automatically builds dependencies.
-rw-r--r--numpy/distutils/misc_util.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/distutils/misc_util.py b/numpy/distutils/misc_util.py
index 770829349..11992374a 100644
--- a/numpy/distutils/misc_util.py
+++ b/numpy/distutils/misc_util.py
@@ -860,7 +860,7 @@ class Configuration(object):
assert not is_glob_pattern(d),`d`
dist = self.get_distribution()
- if dist is not None:
+ if dist is not None and dist.data_files is not None:
data_files = dist.data_files
else:
data_files = self.data_files
@@ -957,7 +957,7 @@ class Configuration(object):
assert not is_glob_pattern(d),`d,filepat`
dist = self.get_distribution()
- if dist is not None:
+ if dist is not None and dist.data_files is not None:
data_files = dist.data_files
else:
data_files = self.data_files