Merged revisions 5762-5811 via svnmerge from

http://svn.scipy.org/svn/numpy/trunk

........
  r5768 | ptvirtan | 2008-09-05 03:04:35 +0900 (Fri, 05 Sep 2008) | 1 line
  
  Ufunc docstrings: show the 'out' arguments in a more standard way
........
  r5769 | alan.mcintyre | 2008-09-05 03:23:48 +0900 (Fri, 05 Sep 2008) | 4 lines
  
  Replaced numpy.testing.decorators.skipknownfailure with knownfailureif, 
  which allows flagging tests as known failures rather than skips.
  Updated test_umath to use knownfailureif.
........
  r5770 | alan.mcintyre | 2008-09-05 06:13:29 +0900 (Fri, 05 Sep 2008) | 2 lines
  
  Renamed classes to conform to PEP 8.
........
  r5771 | alan.mcintyre | 2008-09-05 07:06:01 +0900 (Fri, 05 Sep 2008) | 2 lines
  
  Fix link to example.py.
........
  r5772 | alan.mcintyre | 2008-09-05 10:20:09 +0900 (Fri, 05 Sep 2008) | 2 lines
  
  Remove debugging code.
........
  r5788 | dhuard | 2008-09-05 22:58:00 +0900 (Fri, 05 Sep 2008) | 1 line
  
  Applied patch from R. May fixing ticket #905 (loadtxt). Fixed other bug occurring when both usecols and converters are provided. Added related regression tests.
........
  r5789 | oliphant | 2008-09-05 23:06:02 +0900 (Fri, 05 Sep 2008) | 1 line
  
  Add final date-time proposal.
........
  r5791 | pierregm | 2008-09-06 08:38:44 +0900 (Sat, 06 Sep 2008) | 1 line
  
  * fixed deepcopy of masked arrays (bug #906)
........
  r5793 | cdavid | 2008-09-07 16:16:28 +0900 (Sun, 07 Sep 2008) | 8 lines
  
  scons command: fix one more issue related to build dir.
  
  The distutils installation directory relative to the scons build directory was
  not always computed right. The relative position on the fs does not depend on
  the source directory (in out-of-place builds), but on the package *name*
  translated to a directly only.
........
  r5796 | pearu | 2008-09-09 19:55:30 +0900 (Tue, 09 Sep 2008) | 1 line
  
  Fix typo.
........
  r5797 | stefan | 2008-09-09 22:38:34 +0900 (Tue, 09 Sep 2008) | 2 lines
  
  FIX: Loadtxt raises on empty input (closes #908).
........
  r5799 | alan.mcintyre | 2008-09-10 02:48:47 +0900 (Wed, 10 Sep 2008) | 2 lines
  
  Removed unused imports.
........
  r5800 | pierregm | 2008-09-10 03:25:15 +0900 (Wed, 10 Sep 2008) | 1 line
  
  * make sure that minimum & maximum actually return a MaskedArray
........
  r5803 | pierregm | 2008-09-12 04:54:31 +0900 (Fri, 12 Sep 2008) | 1 line
  
  * fixed view for MaskedArrays w/ flexible dtype
........
  r5804 | jarrod.millman | 2008-09-13 04:20:26 +0900 (Sat, 13 Sep 2008) | 2 lines
  
  FIX: broken links
........
  r5805 | jarrod.millman | 2008-09-13 04:23:20 +0900 (Sat, 13 Sep 2008) | 2 lines
  
  FIX: broken links
........
  r5806 | alan.mcintyre | 2008-09-13 11:53:53 +0900 (Sat, 13 Sep 2008) | 2 lines
  
  Fix failing doctests.
........
  r5807 | alan.mcintyre | 2008-09-13 11:56:33 +0900 (Sat, 13 Sep 2008) | 2 lines
  
  Remove unused imports.
........
  r5808 | alan.mcintyre | 2008-09-13 12:40:57 +0900 (Sat, 13 Sep 2008) | 7 lines
  
  Removed unused/duplicate imports.
  Removed repeated members of __all__.
  Fixed reference to undefined "out" in functions.py:take function.
  Fixed references to undefined "N" in functions.py.
  Rewrapped lines to conform to PEP8.
  Fixed references to undefined FPE_* constants (from numpy) in util.py.
........
  r5809 | cdavid | 2008-09-13 15:03:30 +0900 (Sat, 13 Sep 2008) | 6 lines
  
  Fix cygwin compilation
  
  Recent version of binutils (2.18.50) do not accept 4 bytes operand for some
  opcodes like fnstsw (which always expected a 2 bytes operand). Replace the type
  of the argument from unsigned 2 bytes to unsigned 4 bytes unsigned integer.
........
  r5810 | cdavid | 2008-09-13 15:27:46 +0900 (Sat, 13 Sep 2008) | 1 line
  
  Tag ctypes load library tests as known failures on cygwin.
........

1 files changed, 4 insertions, 3 deletions

diff --git a/numpy/distutils/command/scons.py b/numpy/distutils/command/scons.py
index d0792be5d..80795a010 100644
--- a/numpy/distutils/command/scons.py
+++ b/numpy/distutils/command/scons.py
@@ -44,11 +44,12 @@ def get_scons_local_path():
     from numscons import get_scons_path
     return get_scons_path()
 
-def get_distutils_libdir(cmd, sconscript_path):
+def get_distutils_libdir(cmd, pkg):
     """Returns the path where distutils install libraries, relatively to the
     scons build directory."""
     from numscons import get_scons_build_dir
-    scdir = pjoin(get_scons_build_dir(), pdirname(sconscript_path))
+    from numscons.core.utils import pkg_to_path
+    scdir = pjoin(get_scons_build_dir(), pkg_to_path(pkg))
     n = scdir.count(os.sep)
     return pjoin(os.sep.join([os.pardir for i in range(n+1)]), cmd.build_lib)
 
@@ -424,7 +425,7 @@ class scons(old_build_ext):
                 #cmd.append('distutils_libdir=%s' % protect_path(pjoin(self.build_lib,
                 #                                                    pdirname(sconscript))))
                 cmd.append('distutils_libdir=%s' %
-                             protect_path(get_distutils_libdir(self, sconscript)))
+                             protect_path(get_distutils_libdir(self, pkg_name)))
 
                 if not self._bypass_distutils_cc:
                     cmd.append('cc_opt=%s' % self.scons_compiler)