[pypy-svn] r25200 - in pypy/dist/pypy/rpython: . test

[arigo at codespeak.net]

Author: arigo
Date: Sat Apr  1 10:02:15 2006
New Revision: 25200

Modified:
   pypy/dist/pypy/rpython/rpbc.py
   pypy/dist/pypy/rpython/test/test_rpbc.py
Log:
(pedronis, arre, arigo)

Yet Another Case of conversion missing in rpbc.py.


Modified: pypy/dist/pypy/rpython/rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/rpbc.py	(original)
+++ pypy/dist/pypy/rpython/rpbc.py	Sat Apr  1 10:02:15 2006
@@ -1,6 +1,6 @@
 import types
 import sys
-from pypy.annotation.pairtype import pairtype
+from pypy.annotation.pairtype import pair, pairtype
 from pypy.annotation import model as annmodel
 from pypy.annotation import description
 from pypy.objspace.flow.model import Constant
@@ -552,6 +552,11 @@
         # now hop2 looks like simple_call(function, self, args...)
         return hop2.dispatch()
 
+class __extend__(pairtype(MethodOfFrozenPBCRepr, MethodOfFrozenPBCRepr)):
+
+    def convert_from_to((r_from, r_to), v, llops):
+        return pair(r_from.r_im_self, r_to.r_im_self).convert_from_to(v, llops)
+
 # __ None ____________________________________________________
 class NoneFrozenPBCRepr(SingleFrozenPBCRepr):
     

Modified: pypy/dist/pypy/rpython/test/test_rpbc.py
==============================================================================
--- pypy/dist/pypy/rpython/test/test_rpbc.py	(original)
+++ pypy/dist/pypy/rpython/test/test_rpbc.py	Sat Apr  1 10:02:15 2006
@@ -1166,7 +1166,6 @@
         assert res == 65*66
 
     def test_convert_multiple_to_single_method_of_frozen_pbc(self):
-        py.test.skip("in-progress")
         class A:
             def meth(self, frmeth):
                 return frmeth(100)