[Numpy-svn] r2888 - in branches/ver1.0/numpy/core: . src

[numpy-svn at scipy.org]

Author: oliphant
Date: 2006-07-25 02:14:05 -0500 (Tue, 25 Jul 2006)
New Revision: 2888

Modified:
   branches/ver1.0/numpy/core/setup.py
   branches/ver1.0/numpy/core/src/arrayobject.c
Log:
Update check for no-threading and change wording of error.

Modified: branches/ver1.0/numpy/core/setup.py
===================================================================
--- branches/ver1.0/numpy/core/setup.py	2006-07-25 07:00:48 UTC (rev 2887)
+++ branches/ver1.0/numpy/core/setup.py	2006-07-25 07:14:05 UTC (rev 2888)
@@ -42,7 +42,7 @@
                 #  ufunc code.  NPY_ALLOW_C_API and friends
                 #  cause the segfault. So, we disable threading
                 #  for now. 
-            if sys.version[:3] < '2.4':
+            if sys.version[:5] < '2.4.2':
                 nosmp = 1
             else:
                 # Perhaps a fancier check is in order here.

Modified: branches/ver1.0/numpy/core/src/arrayobject.c
===================================================================
--- branches/ver1.0/numpy/core/src/arrayobject.c	2006-07-25 07:00:48 UTC (rev 2887)
+++ branches/ver1.0/numpy/core/src/arrayobject.c	2006-07-25 07:14:05 UTC (rev 2888)
@@ -10461,7 +10461,7 @@
 					Py_XDECREF(value);
 					Py_XDECREF(traceback);
 					PyErr_SetString(PyExc_ValueError,
-							"alignment cannot be True" \
+							"align cannot be True" \
 							" with array_descriptor " \
 							"specification.");
 				}