diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-04-24 20:58:53 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-04-24 20:58:53 +0000 |
| commit | 628087d5e53b152435b71d9330a04719169fa033 (patch) | |
| tree | c2526e1433311aef43ae9f3f150228fbf45b80fe | |
| parent | 448bb44cca09075c0281f0857109db3925908098 (diff) | |
| download | numpy-628087d5e53b152435b71d9330a04719169fa033.tar.gz | |
Change svn:eol-style to native
| -rw-r--r-- | numpy/core/src/scalartypes.inc.src | 40 | ||||
| -rw-r--r-- | numpy/core/tests/test_oldnumeric.py | 26 |
2 files changed, 33 insertions, 33 deletions
diff --git a/numpy/core/src/scalartypes.inc.src b/numpy/core/src/scalartypes.inc.src index 4df401c78..516c7b31e 100644 --- a/numpy/core/src/scalartypes.inc.src +++ b/numpy/core/src/scalartypes.inc.src @@ -2075,29 +2075,29 @@ static PyTypeObject Py@NAME@ArrType_Type = { PyObject_HEAD_INIT(NULL) 0, /*ob_size*/ "@name@" STRBITSOF_C@CNAME@ "scalar", /*tp_name*/ - sizeof(Py@NAME@ScalarObject), /*tp_basicsize*/
- 0, /*tp_itemsize*/
- 0, /*tp_dealloc*/
- 0, /*tp_print*/
- 0, /*tp_getattr*/
- 0, /*tp_setattr*/
- 0, /*tp_compare*/
- 0, /*tp_repr*/
- 0, /*tp_as_number*/
- 0, /*tp_as_sequence*/
- 0, /*tp_as_mapping*/
- 0, /*tp_hash */
- 0, /*tp_call*/
- 0, /*tp_str*/
- 0, /*tp_getattro*/
- 0, /*tp_setattro*/
- 0, /*tp_as_buffer*/
- Py_TPFLAGS_DEFAULT, /*tp_flags*/
+ sizeof(Py@NAME@ScalarObject), /*tp_basicsize*/ + 0, /*tp_itemsize*/ + 0, /*tp_dealloc*/ + 0, /*tp_print*/ + 0, /*tp_getattr*/ + 0, /*tp_setattr*/ + 0, /*tp_compare*/ + 0, /*tp_repr*/ + 0, /*tp_as_number*/ + 0, /*tp_as_sequence*/ + 0, /*tp_as_mapping*/ + 0, /*tp_hash */ + 0, /*tp_call*/ + 0, /*tp_str*/ + 0, /*tp_getattro*/ + 0, /*tp_setattro*/ + 0, /*tp_as_buffer*/ + Py_TPFLAGS_DEFAULT, /*tp_flags*/ "Composed of two " STRBITSOF_@CNAME@ " bit floats", /* tp_doc */ }; -/**end repeat**/
-
+/**end repeat**/ + static PyNumberMethods longdoubletype_as_number; static PyNumberMethods clongdoubletype_as_number; diff --git a/numpy/core/tests/test_oldnumeric.py b/numpy/core/tests/test_oldnumeric.py index df8d9a3db..0173bdcca 100644 --- a/numpy/core/tests/test_oldnumeric.py +++ b/numpy/core/tests/test_oldnumeric.py @@ -9,20 +9,20 @@ class test_put(ScipyTestCase): put(a,[1],[1.2]) assert_array_equal(a,[0,1,0]) put(a,[1],array([2.2])) - assert_array_equal(a,[0,2,0])
-
-class test_wrapit(ScipyTestCase):
- def check_array_subclass(self, level=1):
+ assert_array_equal(a,[0,2,0]) + +class test_wrapit(ScipyTestCase): + def check_array_subclass(self, level=1): class subarray(ndarray): - def get_argmax(self):
- raise AttributeError
- argmax = property(get_argmax)
- a = subarray([3], int, arange(3))
- assert_equal(argmax(a), 2)
- b = subarray([3, 3], int, arange(9))
- bmax = argmax(b)
- assert_array_equal(bmax, [2,2,2])
- assert_equal(type(bmax), subarray)
+ def get_argmax(self): + raise AttributeError + argmax = property(get_argmax) + a = subarray([3], int, arange(3)) + assert_equal(argmax(a), 2) + b = subarray([3, 3], int, arange(9)) + bmax = argmax(b) + assert_array_equal(bmax, [2,2,2]) + assert_equal(type(bmax), subarray) if __name__ == "__main__": |