[Numpy-svn] r3372 - in trunk/numpy: core/src distutils/fcompiler

numpy-svn at scipy.org numpy-svn at scipy.org
Thu Oct 19 17:55:26 CDT 2006


Author: oliphant
Date: 2006-10-19 17:55:23 -0500 (Thu, 19 Oct 2006)
New Revision: 3372

Modified:
   trunk/numpy/core/src/arraymethods.c
   trunk/numpy/distutils/fcompiler/intel.py
Log:
Fix missing comment characters in intel.py.  Check for None in .reshape and .resize

Modified: trunk/numpy/core/src/arraymethods.c
===================================================================
--- trunk/numpy/core/src/arraymethods.c	2006-10-19 22:03:23 UTC (rev 3371)
+++ trunk/numpy/core/src/arraymethods.c	2006-10-19 22:55:23 UTC (rev 3372)
@@ -71,6 +71,8 @@
 
 	n = PyTuple_Size(args);
 	if (n <= 1) {
+                if (PyTuple_GET_ITEM(args, 0) == Py_None)
+                        return PyArray_View(self, NULL, NULL);
 		if (!PyArg_ParseTuple(args, "O&", PyArray_IntpConverter,
 				      &newshape)) return NULL;
 	}
@@ -774,6 +776,10 @@
 	}
 	n = PyTuple_Size(args);
 	if (n <= 1) {
+                if (PyTuple_GET_ITEM(args, 0) == Py_None) {
+                        Py_INCREF(Py_None);
+                        return Py_None;
+                }
 		if (!PyArg_ParseTuple(args, "O&", PyArray_IntpConverter,
 				      &newshape)) return NULL;
 	}

Modified: trunk/numpy/distutils/fcompiler/intel.py
===================================================================
--- trunk/numpy/distutils/fcompiler/intel.py	2006-10-19 22:03:23 UTC (rev 3371)
+++ trunk/numpy/distutils/fcompiler/intel.py	2006-10-19 22:55:23 UTC (rev 3372)
@@ -78,10 +78,10 @@
                       ' for (the Itanium\(TM\)|Itanium\(R\))-based applications(,|)'\
                       '\s+Version (?P<version>[^\s*]*)'
 
-Intel(R) Fortran Itanium(R) Compiler for Itanium(R)-based applications
-Version 9.1    Build 20060928 Package ID: l_fc_c_9.1.039
-Copyright (C) 1985-2006 Intel Corporation.  All rights reserved.
-30 DAY EVALUATION LICENSE
+#Intel(R) Fortran Itanium(R) Compiler for Itanium(R)-based applications
+#Version 9.1    Build 20060928 Package ID: l_fc_c_9.1.039
+#Copyright (C) 1985-2006 Intel Corporation.  All rights reserved.
+#30 DAY EVALUATION LICENSE
 
     for fc_exe in map(find_executable,['ifort','efort','efc']):
         if os.path.isfile(fc_exe):



More information about the Numpy-svn mailing list