[pypy-svn] pypy collections-module: Hash.

arigo commits-noreply at bitbucket.org
Tue Feb 15 17:58:43 CET 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: collections-module
Changeset: r41980:ddd748e32e70
Date: 2011-02-15 17:39 +0100
http://bitbucket.org/pypy/pypy/changeset/ddd748e32e70/

Log:	Hash.

diff --git a/pypy/module/_collections/test/test_deque.py b/pypy/module/_collections/test/test_deque.py
--- a/pypy/module/_collections/test/test_deque.py
+++ b/pypy/module/_collections/test/test_deque.py
@@ -228,26 +228,9 @@
         d.append(d)
         assert '...' in repr(d)
 
-    def test_print(self):
-        d = deque(xrange(200))
-        d.append(d)
-        test_support.unlink(test_support.TESTFN)
-        fo = open(test_support.TESTFN, "wb")
-        try:
-            print >> fo, d,
-            fo.close()
-            fo = open(test_support.TESTFN, "rb")
-            self.assertEqual(fo.read(), repr(d))
-        finally:
-            fo.close()
-            test_support.unlink(test_support.TESTFN)
-
-    def test_init(self):
-        self.assertRaises(TypeError, deque, 'abc', 2, 3);
-        self.assertRaises(TypeError, deque, 1);
-
     def test_hash(self):
-        self.assertRaises(TypeError, hash, deque('abc'))
+        from _collections import deque
+        raises(TypeError, hash, deque('abc'))
 
     def test_long_steadystate_queue_popleft(self):
         for size in (0, 1, 2, 100, 1000):

diff --git a/pypy/module/_collections/interp_deque.py b/pypy/module/_collections/interp_deque.py
--- a/pypy/module/_collections/interp_deque.py
+++ b/pypy/module/_collections/interp_deque.py
@@ -463,6 +463,7 @@
     __ne__ = interp2app(W_Deque.ne),
     __gt__ = interp2app(W_Deque.gt),
     __ge__ = interp2app(W_Deque.ge),
+    __hash__ = None,
     __iadd__ = interp2app(W_Deque.iadd),
     __getitem__ = interp2app(W_Deque.getitem),
     __setitem__ = interp2app(W_Deque.setitem),


More information about the Pypy-commit mailing list