[Numpy-svn] r2783 - in trunk/numpy: core/include/numpy numarray

[numpy-svn at scipy.org]

Author: oliphant
Date: 2006-07-07 21:08:07 -0500 (Fri, 07 Jul 2006)
New Revision: 2783

Modified:
   trunk/numpy/core/include/numpy/noprefix.h
   trunk/numpy/numarray/__init__.py
   trunk/numpy/numarray/util.py
Log:
fix numarray package a bit.

Modified: trunk/numpy/core/include/numpy/noprefix.h
===================================================================
--- trunk/numpy/core/include/numpy/noprefix.h	2006-07-08 01:54:48 UTC (rev 2782)
+++ trunk/numpy/core/include/numpy/noprefix.h	2006-07-08 02:08:07 UTC (rev 2783)
@@ -178,4 +178,7 @@
 #define REFCOUNT NPY_REFCOUNT
 #define MAX_ELSIZE NPY_MAX_ELSIZE
 
+#define MAX NPY_MAX
+#define MIN NPY_MIN
+
 #endif 

Modified: trunk/numpy/numarray/__init__.py
===================================================================
--- trunk/numpy/numarray/__init__.py	2006-07-08 01:54:48 UTC (rev 2782)
+++ trunk/numpy/numarray/__init__.py	2006-07-08 02:08:07 UTC (rev 2783)
@@ -0,0 +1,2 @@
+from util import *
+__all__ = util.__all__

Modified: trunk/numpy/numarray/util.py
===================================================================
--- trunk/numpy/numarray/util.py	2006-07-08 01:54:48 UTC (rev 2782)
+++ trunk/numpy/numarray/util.py	2006-07-08 02:08:07 UTC (rev 2783)
@@ -1,6 +1,9 @@
 
 from numpy import geterr
 
+__all__ = ['MathDomainError', 'UnderflowError', 'NumOverflowError', 'handleError',
+           'get_numarray_include_dirs']
+
 class MathDomainError(ArithmeticError): pass
 class UnderflowError(ArithmeticError): pass
 class NumOverflowError(OverflowError, ArithmeticError): pass