diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2011-07-09 09:25:53 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2011-07-09 09:25:53 -0600 |
| commit | 98d0c8f79443bf6f44883739d1876a3dc2498f6f (patch) | |
| tree | 887948c79959cbc0700e34c2b8e30feffd6a0c72 /numpy/lib | |
| parent | 978862660363f17962149ece1dfb67fa8051a8a1 (diff) | |
| parent | a26bb0d7ba1f8ac541c9048bcc88bb8031d5d283 (diff) | |
| download | numpy-98d0c8f79443bf6f44883739d1876a3dc2498f6f.tar.gz | |
Merge branch 'pull-105'
* pull-105:
STY: Put spaces around the '&' and '|' operators.
STY: Fix 'copy' 'copyto' typo and remove some trailing whitespace.
ENH: Use np.copyto instead of np.fill in some places
ENH: core: Add np.copyto, PyArray_MaskedMoveInto, PyArray_MaskedCopyInto
ENH: core: Add support for masked strided transfer functions
NEP: missingdata: Add a small note about single NA vs multi-NA
NEP: missingdata: Describe a possible way multi-NA could be added in the future
NEP: missingdata: Change the mask definition
STY: Some small stylistic changes
ENH: nditer: Add the basic checking and input of the MASK-related flags
NEP: missingdata: Design the mask binary format so it's extensible with a payload
DEP: core: Move 'fortran' macro into the deprecated header
ENH: nditer: Add the per-operand masked iteration flags
WRN: Get rid of some of the deprecation warnings about 'O4'
DEP: core: Move NPY_AO into the deprecated API header
Diffstat (limited to 'numpy/lib')
| -rw-r--r-- | numpy/lib/tests/test_format.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/numpy/lib/tests/test_format.py b/numpy/lib/tests/test_format.py index 76fc81397..213d69760 100644 --- a/numpy/lib/tests/test_format.py +++ b/numpy/lib/tests/test_format.py @@ -259,18 +259,18 @@ Test the header writing. "F\x00{'descr': '>c16', 'fortran_order': False, 'shape': (3, 5)} \n" "F\x00{'descr': '>c16', 'fortran_order': True, 'shape': (5, 3)} \n" "F\x00{'descr': '>c16', 'fortran_order': False, 'shape': (3, 3)} \n" - "F\x00{'descr': '|O4', 'fortran_order': False, 'shape': (0,)} \n" - "F\x00{'descr': '|O4', 'fortran_order': False, 'shape': ()} \n" - "F\x00{'descr': '|O4', 'fortran_order': False, 'shape': (15,)} \n" - "F\x00{'descr': '|O4', 'fortran_order': False, 'shape': (3, 5)} \n" - "F\x00{'descr': '|O4', 'fortran_order': True, 'shape': (5, 3)} \n" - "F\x00{'descr': '|O4', 'fortran_order': False, 'shape': (3, 3)} \n" - "F\x00{'descr': '|O4', 'fortran_order': False, 'shape': (0,)} \n" - "F\x00{'descr': '|O4', 'fortran_order': False, 'shape': ()} \n" - "F\x00{'descr': '|O4', 'fortran_order': False, 'shape': (15,)} \n" - "F\x00{'descr': '|O4', 'fortran_order': False, 'shape': (3, 5)} \n" - "F\x00{'descr': '|O4', 'fortran_order': True, 'shape': (5, 3)} \n" - "F\x00{'descr': '|O4', 'fortran_order': False, 'shape': (3, 3)} \n" + "F\x00{'descr': 'O', 'fortran_order': False, 'shape': (0,)} \n" + "F\x00{'descr': 'O', 'fortran_order': False, 'shape': ()} \n" + "F\x00{'descr': 'O', 'fortran_order': False, 'shape': (15,)} \n" + "F\x00{'descr': 'O', 'fortran_order': False, 'shape': (3, 5)} \n" + "F\x00{'descr': 'O', 'fortran_order': True, 'shape': (5, 3)} \n" + "F\x00{'descr': 'O', 'fortran_order': False, 'shape': (3, 3)} \n" + "F\x00{'descr': 'O', 'fortran_order': False, 'shape': (0,)} \n" + "F\x00{'descr': 'O', 'fortran_order': False, 'shape': ()} \n" + "F\x00{'descr': 'O', 'fortran_order': False, 'shape': (15,)} \n" + "F\x00{'descr': 'O', 'fortran_order': False, 'shape': (3, 5)} \n" + "F\x00{'descr': 'O', 'fortran_order': True, 'shape': (5, 3)} \n" + "F\x00{'descr': 'O', 'fortran_order': False, 'shape': (3, 3)} \n" "v\x00{'descr': [('x', '<i4', (2,)), ('y', '<f8', (2, 2)), ('z', '|u1')],\n 'fortran_order': False,\n 'shape': (2,)} \n" "\x16\x02{'descr': [('x', '<i4', (2,)),\n ('Info',\n [('value', '<c16'),\n ('y2', '<f8'),\n ('Info2',\n [('name', '|S2'),\n ('value', '<c16', (2,)),\n ('y3', '<f8', (2,)),\n ('z3', '<u4', (2,))]),\n ('name', '|S2'),\n ('z2', '|b1')]),\n ('color', '|S2'),\n ('info', [('Name', '<U8'), ('Value', '<c16')]),\n ('y', '<f8', (2, 2)),\n ('z', '|u1')],\n 'fortran_order': False,\n 'shape': (2,)} \n" "v\x00{'descr': [('x', '>i4', (2,)), ('y', '>f8', (2, 2)), ('z', '|u1')],\n 'fortran_order': False,\n 'shape': (2,)} \n" |