[pypy-commit] pypy default: merge heads

[mattip]

Author: mattip <matti.picus at gmail.com>
Branch: 
Changeset: r72122:b4af9ad3c7d8
Date: 2014-06-21 22:20 +0300
http://bitbucket.org/pypy/pypy/changeset/b4af9ad3c7d8/

Log:	merge heads

diff --git a/lib_pypy/_ctypes/function.py b/lib_pypy/_ctypes/function.py
--- a/lib_pypy/_ctypes/function.py
+++ b/lib_pypy/_ctypes/function.py
@@ -219,6 +219,8 @@
             if restype is None:
                 import ctypes
                 restype = ctypes.c_int
+            if self._argtypes_ is None:
+                self._argtypes_ = []
             self._ptr = self._getfuncptr_fromaddress(self._argtypes_, restype)
             self._check_argtypes_for_fastpath()
             return
diff --git a/pypy/module/sys/vm.py b/pypy/module/sys/vm.py
--- a/pypy/module/sys/vm.py
+++ b/pypy/module/sys/vm.py
@@ -244,7 +244,8 @@
     handle = space.fromcache(State).get_pythonapi_handle()
 
     # Make a dll object with it
-    from pypy.module._rawffi.interp_rawffi import W_CDLL, RawCDLL
+    from pypy.module._rawffi.interp_rawffi import W_CDLL
+    from rpython.rlib.clibffi import RawCDLL
     cdll = RawCDLL(handle)
     return space.wrap(W_CDLL(space, "python api", cdll))