Author: Brian Kearns <bdkea...@gmail.com>
Branch: py3k
Changeset: r62248:9e3022ea2ccb
Date: 2013-03-08 15:32 -0500
http://bitbucket.org/pypy/pypy/changeset/9e3022ea2ccb/
Log: merge default
diff --git a/pypy/module/_cffi_backend/ctypeptr.py
b/pypy/module/_cffi_backend/ctypeptr.py
--- a/pypy/module/_cffi_backend/ctypeptr.py
+++ b/pypy/module/_cffi_backend/ctypeptr.py
@@ -254,7 +254,6 @@
def prepare_file(self, w_ob):
from pypy.module._io.interp_iobase import W_IOBase
- from pypy.module._cffi_backend import ctypefunc
ob = self.space.interpclass_w(w_ob)
if isinstance(ob, W_IOBase):
return prepare_file_argument(self.space, ob)
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
