]> granicus.if.org Git - python/commitdiff
Backport fc8f1b1c76bf.
authorStefan Krah <skrah@bytereef.org>
Tue, 6 Nov 2012 22:27:24 +0000 (23:27 +0100)
committerStefan Krah <skrah@bytereef.org>
Tue, 6 Nov 2012 22:27:24 +0000 (23:27 +0100)
Lib/test/test_buffer.py

index 977b282d636d242b86ad139fe112ebfb245800bf..747e2a287ee24ddc80787ca7dba29de14bb957a2 100644 (file)
@@ -4001,23 +4001,13 @@ class TestBufferProtocol(unittest.TestCase):
 
         # equality-hash invariant
         x = ndarray(list(range(12)), shape=[12], format='B')
-        a = memoryview(nd)
+        a = memoryview(x)
 
         y = ndarray(list(range(12)), shape=[12], format='b')
-        b = memoryview(nd)
+        b = memoryview(y)
 
-        z = ndarray(list(bytes(chr(x), 'latin-1') for x in range(12)),
-                    shape=[12], format='c')
-        c = memoryview(nd)
-
-        if (a == b):
-            self.assertEqual(hash(a), hash(b))
-
-        if (a == c):
-            self.assertEqual(hash(a), hash(c))
-
-        if (b == c):
-            self.assertEqual(hash(b), hash(c))
+        self.assertEqual(a, b)
+        self.assertEqual(hash(a), hash(b))
 
         # non-byte formats
         nd = ndarray(list(range(12)), shape=[2,2,3], format='L')