Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3.3
Changeset: r72784:d121572ebfcd
Date: 2014-08-12 17:16 -0700
http://bitbucket.org/pypy/pypy/changeset/d121572ebfcd/
Log: merge py3k
diff --git a/pypy/module/cpyext/buffer.py b/pypy/module/cpyext/buffer.py
--- a/pypy/module/cpyext/buffer.py
+++ b/pypy/module/cpyext/buffer.py
@@ -1,5 +1,6 @@
from rpython.rtyper.lltypesystem import rffi, lltype
from rpython.rlib import buffer
+from rpython.rlib.objectmodel import import_from_mixin
from pypy.module.cpyext.api import (
cpython_api, CANNOT_FAIL, Py_buffer)
from pypy.module.cpyext.pyobject import PyObject, Py_DecRef
@@ -13,7 +14,6 @@
return 1
class CBufferMixin(object):
- _mixin_ = True
def __init__(self, space, c_buf, c_len, w_obj):
self.space = space
@@ -35,7 +35,8 @@
return rffi.charpsize2str(rffi.cast(rffi.CCHARP, self.c_buf),
self.c_len)
-class CBuffer(CBufferMixin, buffer.Buffer):
+class CBuffer(buffer.Buffer):
+ import_from_mixin(CBufferMixin)
_immutable_ = True
def __del__(self):
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
