Author: Philip Jenvey <[email protected]>
Branch: refactor-buffer-api
Changeset: r68263:e60a94e352e0
Date: 2013-11-20 14:43 -0800
http://bitbucket.org/pypy/pypy/changeset/e60a94e352e0/
Log: minor cleanup
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -197,10 +197,10 @@
return None
def buffer_w(self, space):
- from pypy.module.__builtin__.interp_memoryview import W_Buffer
w_impl = space.lookup(self, '__buffer__')
if w_impl is not None:
w_result = space.get_and_call_function(w_impl, self)
+ from pypy.module.__builtin__.interp_memoryview import W_Buffer
if isinstance(w_result, W_Buffer):
return w_result.buf
self._typed_unwrap_error(space, "buffer")
diff --git a/pypy/module/_cffi_backend/cbuffer.py
b/pypy/module/_cffi_backend/cbuffer.py
--- a/pypy/module/_cffi_backend/cbuffer.py
+++ b/pypy/module/_cffi_backend/cbuffer.py
@@ -43,7 +43,7 @@
class MiniBuffer(W_Buffer):
def __init__(self, buffer, keepalive=None):
- W_Buffer. __init__(self, buffer)
+ W_Buffer.__init__(self, buffer)
self.keepalive = keepalive
MiniBuffer.typedef = TypeDef(
diff --git a/pypy/module/cpyext/bufferobject.py
b/pypy/module/cpyext/bufferobject.py
--- a/pypy/module/cpyext/bufferobject.py
+++ b/pypy/module/cpyext/bufferobject.py
@@ -5,8 +5,8 @@
from pypy.module.cpyext.pyobject import make_typedescr, Py_DecRef, make_ref
from pypy.interpreter.buffer import StringBuffer, SubBuffer
from pypy.interpreter.error import OperationError
+from pypy.module.__builtin__.interp_memoryview import W_Buffer
from pypy.module.array.interp_array import ArrayBuffer
-from pypy.module.__builtin__.interp_memoryview import W_Buffer
PyBufferObjectStruct = lltype.ForwardReference()
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
