[pypy-commit] pypy default: merge

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: 
Changeset: r67090:a78e2971e1e8
Date: 2013-09-25 11:37 +0200
http://bitbucket.org/pypy/pypy/changeset/a78e2971e1e8/

Log:	merge

diff --git a/pypy/objspace/std/test/test_boolobject.py b/pypy/objspace/std/test/test_boolobject.py
--- a/pypy/objspace/std/test/test_boolobject.py
+++ b/pypy/objspace/std/test/test_boolobject.py
@@ -44,6 +44,13 @@
     def test_bool_int(self):
         assert int(True) is 1
         assert int(False) is 0
+        # XXX: broken
+        #assert True.__int__() is 1
+
+    def test_bool_long(self):
+        assert long(True) is 1L
+        assert long(False) is 0L
+        assert True.__long__() is 1L
 
     def test_bool_ops(self):
         assert True + True == 2