From cd92423d1f11afead06f534c9044607eabfe11f4 Mon Sep 17 00:00:00 2001
From: Mark Wiebe <mwiebe@enthought.com>
Date: Thu, 7 Jul 2011 14:36:10 -0500
Subject: WRN: Get rid of some of the deprecation warnings about 'O4'

---
 numpy/lib/tests/test_format.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'numpy/lib')

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"
-- 
cgit v1.2.1