summaryrefslogtreecommitdiff
path: root/misc_util.py
diff options
context:
space:
mode:
authorcookedm <cookedm@localhost>2007-05-16 15:27:12 +0000
committercookedm <cookedm@localhost>2007-05-16 15:27:12 +0000
commit4c657edb70dd3a3f810faf1a9b0b5f7049a046cd (patch)
tree29cd1954d2d201fa6287c845be812efe67d3ea6f /misc_util.py
parent9795a2c6225cb56e1e34d53b722f2e2b050b4fdc (diff)
downloadnumpy-4c657edb70dd3a3f810faf1a9b0b5f7049a046cd.tar.gz
Merged revisions 3732-3768 via svnmerge from
http://svn.scipy.org/svn/numpy/trunk/numpy/distutils ........ r3740 | cookedm | 2007-05-10 13:26:20 -0400 (Thu, 10 May 2007) | 2 lines Use a try/finally instead of try/except Exception for cleanup in numpy/distutils/core.py ........ r3745 | pearu | 2007-05-11 08:50:42 -0400 (Fri, 11 May 2007) | 1 line Clean up setup() calls. ........ r3746 | pearu | 2007-05-11 08:58:31 -0400 (Fri, 11 May 2007) | 1 line Using meaningful NotFoundError exception for blas_opt and lapack_opt resources. ........ r3747 | pearu | 2007-05-11 09:37:31 -0400 (Fri, 11 May 2007) | 1 line Raise exception when pyrex is required. ........ r3759 | cookedm | 2007-05-14 05:25:11 -0400 (Mon, 14 May 2007) | 2 lines With gfortran, compile modern Xeon's with EM64T with -march=nocona (#515) ........ r3763 | pearu | 2007-05-14 08:17:49 -0400 (Mon, 14 May 2007) | 1 line Workaround Python distutils bug sf 1718574. ........ r3764 | cookedm | 2007-05-14 20:35:49 -0400 (Mon, 14 May 2007) | 2 lines #520: don't add arch-specific flags when linking with Intel Fortran ........
Diffstat (limited to 'misc_util.py')
-rw-r--r--misc_util.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/misc_util.py b/misc_util.py
index b843f675e..fd771429e 100644
--- a/misc_util.py
+++ b/misc_util.py
@@ -530,9 +530,10 @@ class Configuration(object):
caller_frame = get_frame(caller_level)
caller_name = eval('__name__',caller_frame.f_globals,caller_frame.f_locals)
self.local_path = get_path(caller_name, top_path)
+ # local_path -- directory of a file (usually setup.py) that
+ # defines a configuration() function.
if top_path is None:
top_path = self.local_path
- self.local_path = '.'
if package_path is None:
package_path = self.local_path
elif os.path.isdir(njoin(self.local_path,package_path)):