[Numpy-svn] r2770 - in trunk/numpy/core: . src

[numpy-svn at scipy.org]

Author: oliphant
Date: 2006-07-07 13:55:19 -0500 (Fri, 07 Jul 2006)
New Revision: 2770

Modified:
   trunk/numpy/core/ma.py
   trunk/numpy/core/src/arrayobject.c
Log:
Make .T == .transpose()

Modified: trunk/numpy/core/ma.py
===================================================================
--- trunk/numpy/core/ma.py	2006-07-07 18:50:08 UTC (rev 2769)
+++ trunk/numpy/core/ma.py	2006-07-07 18:55:19 UTC (rev 2770)
@@ -1392,12 +1392,8 @@
         return self._data.ctypes
 
     def _get_T(self):
-        if (self.ndim == 0):
+        if (self.ndim < 2):
             return self
-        if (self.ndim == 1):
-            ret = self.view()
-            ret.shape = (self.shape[0], 1)
-            return ret
         return self.transpose()
 
     shape = property(_get_shape, _set_shape,

Modified: trunk/numpy/core/src/arrayobject.c
===================================================================
--- trunk/numpy/core/src/arrayobject.c	2006-07-07 18:50:08 UTC (rev 2769)
+++ trunk/numpy/core/src/arrayobject.c	2006-07-07 18:55:19 UTC (rev 2770)
@@ -6184,34 +6184,11 @@
 static PyObject *
 array_transpose_get(PyArrayObject *self)
 {
-	intp dims[2];
-	intp strides[2];
-	PyObject *new;
-
-	switch(self->nd) {
-	case 0:
+	if (self->nd < 2) {
 		Py_INCREF(self);
 		return (PyObject *)self;
-	case 1:
-		dims[0] = self->dimensions[0];
-		dims[1] = 1;
-		strides[0] = self->strides[0];
-		strides[1] = 0;
-		Py_INCREF(self->descr);
-		new = PyArray_NewFromDescr(self->ob_type,
-					   self->descr,
-					   2, dims,
-					   strides,
-					   self->data,
-					   self->flags, 
-					   (PyObject *)self);
-		if (new==NULL) return NULL;
-		Py_INCREF(self);
-		PyArray_BASE(new) = (PyObject *)self;
-		return new;
-	default:
-		return PyArray_Transpose(self, NULL);
 	}
+	return PyArray_Transpose(self, NULL);
 }
 
 /* If this is None, no function call is made