[pypy-commit] pypy int_w-refactor: merge heads
antocuni
noreply at buildbot.pypy.org
Thu Feb 27 16:39:51 CET 2014
Author: Antonio Cuni <anto.cuni at gmail.com>
Branch: int_w-refactor
Changeset: r69519:4e62d529395e
Date: 2014-02-27 16:39 +0100
http://bitbucket.org/pypy/pypy/changeset/4e62d529395e/
Log: merge heads
diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py
--- a/pypy/interpreter/baseobjspace.py
+++ b/pypy/interpreter/baseobjspace.py
@@ -1375,7 +1375,7 @@
def int_w(self, w_obj, allow_conversion=True):
"""
Unwrap an app-level int object into an interpret-level int.
-
+
If allow_conversion==True, w_obj might be of any type which implements
__int__, *except* floats which are explicitly rejected. This is the
same logic as CPython's PyArg_ParseTuple. If you want to also allow
diff --git a/pypy/interpreter/test/test_gateway.py b/pypy/interpreter/test/test_gateway.py
--- a/pypy/interpreter/test/test_gateway.py
+++ b/pypy/interpreter/test/test_gateway.py
@@ -458,7 +458,7 @@
def test_interp2app_unwrap_spec_typechecks(self):
from rpython.rlib.rarithmetic import r_longlong
-
+
space = self.space
w = space.wrap
def g3_id(space, x):
diff --git a/pypy/module/__builtin__/test/test_buffer.py b/pypy/module/__builtin__/test/test_buffer.py
--- a/pypy/module/__builtin__/test/test_buffer.py
+++ b/pypy/module/__builtin__/test/test_buffer.py
@@ -181,7 +181,8 @@
buf = buffer('hello world')
raises(TypeError, "buf[MyInt(0)]")
raises(TypeError, "buf[MyInt(0):MyInt(5)]")
-
+
+
class AppTestMemoryView:
def test_basic(self):
v = memoryview("abc")
diff --git a/pypy/objspace/std/intobject.py b/pypy/objspace/std/intobject.py
--- a/pypy/objspace/std/intobject.py
+++ b/pypy/objspace/std/intobject.py
@@ -315,7 +315,7 @@
def _int_w(self, space):
return int(self.intval)
-
+
unwrap = _int_w
def uint_w(self, space):
More information about the pypy-commit
mailing list