diff options
author | Travis Oliphant <oliphant@enthought.com> | 2006-07-25 07:14:05 +0000 |
---|---|---|
committer | Travis Oliphant <oliphant@enthought.com> | 2006-07-25 07:14:05 +0000 |
commit | 4eea418ebf33e4d78fd10b6db7d5daadc0bd359d (patch) | |
tree | cd12ef09f55d0845c6862a8245aff89b84bbe27d | |
parent | b2eafe470daa694148b7aebd5080006893ea4829 (diff) | |
download | numpy-4eea418ebf33e4d78fd10b6db7d5daadc0bd359d.tar.gz |
Update check for no-threading and change wording of error.
-rw-r--r-- | numpy/core/setup.py | 2 | ||||
-rw-r--r-- | numpy/core/src/arrayobject.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/setup.py b/numpy/core/setup.py index 3a7df8f63..2cd3afdd4 100644 --- a/numpy/core/setup.py +++ b/numpy/core/setup.py @@ -42,7 +42,7 @@ def configuration(parent_package='',top_path=None): # 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. diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c index b9e954560..08730b296 100644 --- a/numpy/core/src/arrayobject.c +++ b/numpy/core/src/arrayobject.c @@ -10461,7 +10461,7 @@ arraydescr_new(PyTypeObject *subtype, PyObject *args, PyObject *kwds) Py_XDECREF(value); Py_XDECREF(traceback); PyErr_SetString(PyExc_ValueError, - "alignment cannot be True" \ + "align cannot be True" \ " with array_descriptor " \ "specification."); } |