Simplify interfaces. Fix UCHAR bug.

2 files changed, 5 insertions, 5 deletions

diff --git a/numpy/core/include/numpy/arrayobject.h b/numpy/core/include/numpy/arrayobject.h
index 797966a25..a301a8a1b 100644
--- a/numpy/core/include/numpy/arrayobject.h
+++ b/numpy/core/include/numpy/arrayobject.h
@@ -1303,7 +1303,7 @@ typedef struct {
 
 #define PyTypeNum_ISNUMBER(type) (type <= PyArray_CLONGDOUBLE)
 
-#define PyTypeNum_ISSTRING(type) ((type == PyArray_UCHAR) || \
+#define PyTypeNum_ISSTRING(type) ((type == PyArray_STRING) || \
 			       (type == PyArray_UNICODE))
 
 #define PyTypeNum_ISCOMPLEX(type) ((type >= PyArray_CFLOAT) && \
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index 689e5c733..630f9ff66 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -108,17 +108,17 @@ can_cast = multiarray.can_cast
 lexsort = multiarray.lexsort
 
 
-def asarray(a, dtype=None, fortran=None, ndmin=0):
+def asarray(a, dtype=None, fortran=None):
     """returns a as an array.  Unlike array(),
     no copy is performed if a is already an array.  Subclasses are converted
     to base class ndarray.
     """
-    return array(a, dtype, copy=False, fortran=fortran, ndmin=ndmin)
+    return array(a, dtype, copy=False, fortran=fortran)
 
-def asanyarray(a, dtype=None, copy=False, fortran=None, ndmin=0):
+def asanyarray(a, dtype=None, copy=False, fortran=None):
     """will pass subclasses through...
     """
-    return array(a, dtype, copy=copy, fortran=fortran, subok=1, ndmin=ndmin)
+    return array(a, dtype, copy=copy, fortran=fortran, subok=1)
 
 def ascontiguous(a, dtype=None, copy=False):
     return array(a, dtype, copy=copy, fortran=False, ndmin=1)