[pypy-svn] r46277 - in pypy/dist/pypy/translator: jvm/test oosupport

[antocuni at codespeak.net]

Author: antocuni
Date: Mon Sep  3 16:03:24 2007
New Revision: 46277

Modified:
   pypy/dist/pypy/translator/jvm/test/test_streamio.py
   pypy/dist/pypy/translator/jvm/test/test_tuple.py
   pypy/dist/pypy/translator/oosupport/constant.py
Log:
this extra DUP was needed for gencli, where dict of void are represented
with generic classes, but not in genjvm, where they are plain classes.

This code is not even longer needed in gencli, becase of the
_check_for_void_dict in CLIDictMixin!



Modified: pypy/dist/pypy/translator/jvm/test/test_streamio.py
==============================================================================
--- pypy/dist/pypy/translator/jvm/test/test_streamio.py	(original)
+++ pypy/dist/pypy/translator/jvm/test/test_streamio.py	Mon Sep  3 16:03:24 2007
@@ -24,25 +24,5 @@
     pass
 
 class TestTextOutputFilter(JvmTest, BaseTestTextOutputFilter):
-    def test_write_nl(self):
-        py.test.skip("VerifyError - Incompatible object arguments")
-        
-    def test_write_cr(self):
-        py.test.skip("VerifyError - Incompatible object arguments")
-
-    def test_write_crnl(self):
-        py.test.skip("VerifyError - Incompatible object arguments")
-
-    def test_write_tell_nl(self):
-        py.test.skip("VerifyError - Incompatible object arguments")
-    
-    def test_write_tell_cr(self):
-        py.test.skip("VerifyError - Incompatible object arguments")
-    
-    def test_write_tell_crnl(self):
-        py.test.skip("VerifyError - Incompatible object arguments")
-    
-    def test_write_seek(self):
-        py.test.skip("VerifyError - Incompatible object arguments")
-    
+    pass
 

Modified: pypy/dist/pypy/translator/jvm/test/test_tuple.py
==============================================================================
--- pypy/dist/pypy/translator/jvm/test/test_tuple.py	(original)
+++ pypy/dist/pypy/translator/jvm/test/test_tuple.py	Mon Sep  3 16:03:24 2007
@@ -10,14 +10,3 @@
         assert res.item0 == 1.0 and res.item1 == 1
         res = self.interpret(fn, [1.0, 1.0])
         assert res.item0 == 1.0 and res.item1 == 1.0
-    
-    #v116 = oosend(('ll_contains'), (<pypy.rpython.ootypesy...7cc5f0>), i_0)
-    # Arg 01: Exception in thread "main" java.lang.VerifyError
-    def test_constant_tuple_contains(self):
-        py.test.skip("VerifyError - Incompatible object argumemt")
-        
-    def test_constant_tuple_contains2(self):
-        py.test.skip("VerifyError - Incompatible object argumemt")
-        
-    def test_constant_unichar_tuple_contains(self):
-        py.test.skip("VerifyError - Incompatible object argumemt")

Modified: pypy/dist/pypy/translator/oosupport/constant.py
==============================================================================
--- pypy/dist/pypy/translator/oosupport/constant.py	(original)
+++ pypy/dist/pypy/translator/oosupport/constant.py	Mon Sep  3 16:03:24 2007
@@ -648,11 +648,7 @@
             gen.add_comment('  key=%r value=%r' % (key,value))
             push_constant(self.db, KEYTYPE, key, gen)
             gen.prepare_generic_argument(KEYTYPE)
-            if VALUETYPE is ootype.Void:
-                # special case dict of Void; for now store the key as value?
-                gen.dup(KEYTYPE)
-            else:
-                push_constant(self.db, VALUETYPE, value, gen)
+            push_constant(self.db, VALUETYPE, value, gen)
             gen.prepare_generic_argument(VALUETYPE)
             gen.call_method(SELFTYPE, 'll_set')