[pypy-svn] r76256 - in pypy/branch/fast-ctypes/pypy: module/jitffi rlib

[getxsick at codespeak.net]

Author: getxsick
Date: Fri Jul 16 15:04:50 2010
New Revision: 76256

Modified:
   pypy/branch/fast-ctypes/pypy/module/jitffi/interp_jitffi.py
   pypy/branch/fast-ctypes/pypy/rlib/rjitffi.py
Log:
fix translation and revert wrong r76213 which was intended to fix the error


Modified: pypy/branch/fast-ctypes/pypy/module/jitffi/interp_jitffi.py
==============================================================================
--- pypy/branch/fast-ctypes/pypy/module/jitffi/interp_jitffi.py	(original)
+++ pypy/branch/fast-ctypes/pypy/module/jitffi/interp_jitffi.py	Fri Jul 16 15:04:50 2010
@@ -17,7 +17,7 @@
         args_type_w = [ space.str_w(w_x)
                         for w_x in space.listview(w_args_type) ]
         try:
-            ret = W_Get(space, self.rcdll.cpu, space.wrap(self.lib_w),
+            ret = W_Get(space, self.rcdll.cpu, self.lib_w,
                         func, args_type_w, res_type)
         except ValueError, e:
             raise OperationError(space.w_ValueError, space.wrap(str(e)))

Modified: pypy/branch/fast-ctypes/pypy/rlib/rjitffi.py
==============================================================================
--- pypy/branch/fast-ctypes/pypy/rlib/rjitffi.py	(original)
+++ pypy/branch/fast-ctypes/pypy/rlib/rjitffi.py	Fri Jul 16 15:04:50 2010
@@ -25,12 +25,11 @@
     def __init__(self, name):
         name_ptr = rffi.str2charp(name)
         try:
-            handler = rdynload.dlopen(name_ptr)
+            self.handler = rdynload.dlopen(name_ptr)
         except rdynload.DLOpenError, e:
             raise OSError('%s: %s', name, e.msg or 'unspecified error')
         finally:
             rffi.free_charp(name_ptr)
-        self.handler = handler
 
 class _Get(object):
     def __init__(self, cpu, lib, func, args_type, res_type='v'):