Author: Richard Plangger <planri...@gmail.com> Branch: py3.5 Changeset: r86462:74d03f9c65e8 Date: 2016-08-24 10:34 +0200 http://bitbucket.org/pypy/pypy/changeset/74d03f9c65e8/
Log: pull some merge conflicts from py3k diff --git a/lib_pypy/_ctypes/basics.py b/lib_pypy/_ctypes/basics.py --- a/lib_pypy/_ctypes/basics.py +++ b/lib_pypy/_ctypes/basics.py @@ -208,7 +208,7 @@ def cdata_from_address(self, address): # fix the address: turn it into as unsigned, in case it's a negative number - address = address & (sys.maxint * 2 + 1) + address = address & (sys.maxsize * 2 + 1) instance = self.__new__(self) lgt = getattr(self, '_length_', 1) instance._buffer = self._ffiarray.fromaddress(address, lgt) diff --git a/pypy/interpreter/baseobjspace.py b/pypy/interpreter/baseobjspace.py --- a/pypy/interpreter/baseobjspace.py +++ b/pypy/interpreter/baseobjspace.py @@ -585,11 +585,6 @@ self.sys = Module(self, w_name) self.sys.install() - from pypy.module.imp import Module - w_name = self.wrap('imp') - mod = Module(self, w_name) - mod.install() - from pypy.module.__builtin__ import Module w_name = self.wrap('builtins') self.builtin = Module(self, w_name) @@ -2001,7 +1996,7 @@ ObjSpace.IrregularOpTable = [ 'wrap', - 'str_w', + 'bytes_w', 'int_w', 'float_w', 'uint_w', diff --git a/pypy/module/cpyext/typeobjectdefs.py b/pypy/module/cpyext/typeobjectdefs.py --- a/pypy/module/cpyext/typeobjectdefs.py +++ b/pypy/module/cpyext/typeobjectdefs.py @@ -1,7 +1,7 @@ from rpython.rtyper.lltypesystem import rffi, lltype from rpython.rtyper.lltypesystem.lltype import Ptr, FuncType, Void from pypy.module.cpyext.api import (cpython_struct, Py_ssize_t, Py_ssize_tP, - PyVarObjectFields, PyTypeObject, PyTypeObjectPtr, FILEP, + PyVarObjectFields, PyTypeObject, PyTypeObjectPtr, FILEP, Py_Buffer, Py_TPFLAGS_READYING, Py_TPFLAGS_READY, Py_TPFLAGS_HEAPTYPE) from pypy.module.cpyext.pyobject import PyObject, make_ref, from_ref from pypy.module.cpyext.modsupport import PyMethodDef @@ -59,7 +59,7 @@ segcountproc = P(FT([PyO, Py_ssize_tP], Py_ssize_t)) charbufferproc = P(FT([PyO, Py_ssize_t, rffi.CCHARPP], Py_ssize_t)) getbufferproc = P(FT([PyO, Py_bufferP, rffi.INT_real], rffi.INT_real)) -releasebufferproc = P(FT([PyO, Ptr(Py_buffer)], Void)) +releasebufferproc = P(FT([PyO, Py_bufferP], Void)) PyGetSetDef = cpython_struct("PyGetSetDef", ( _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit