Author: [email protected]
Branch: py3.5-raffael_t
Changeset: r83941:e8e88caf2dee
Date: 2016-03-22 14:34 +0100
http://bitbucket.org/pypy/pypy/changeset/e8e88caf2dee/
Log: (patch plan_rich) Set Python 3.5 as library for module, Comment
unfinished ops cmds in astcompiler
diff --git a/pypy/interpreter/astcompiler/assemble.py
b/pypy/interpreter/astcompiler/assemble.py
--- a/pypy/interpreter/astcompiler/assemble.py
+++ b/pypy/interpreter/astcompiler/assemble.py
@@ -557,7 +557,7 @@
ops.LIST_APPEND: -1,
ops.SET_ADD: -1,
ops.MAP_ADD: -2,
- ops.STORE_MAP: -2,
+ # XXX ops.STORE_MAP: -2,
ops.BINARY_POWER: -1,
ops.BINARY_MULTIPLY: -1,
@@ -598,9 +598,9 @@
ops.PRINT_EXPR: -1,
- ops.WITH_CLEANUP: -1,
+ # TODO ops.WITH_CLEANUP: -1,
ops.LOAD_BUILD_CLASS: 1,
- ops.STORE_LOCALS: -1,
+ # TODO ops.STORE_LOCALS: -1,
ops.POP_BLOCK: 0,
ops.POP_EXCEPT: -1,
ops.END_FINALLY: -4, # assume always 4: we pretend that SETUP_FINALLY
@@ -616,7 +616,7 @@
ops.BUILD_MAP: 1,
ops.COMPARE_OP: -1,
- ops.LOOKUP_METHOD: 1,
+ # TODO ops.LOOKUP_METHOD: 1,
ops.LOAD_NAME: 1,
ops.STORE_NAME: -1,
@@ -652,9 +652,9 @@
ops.JUMP_IF_FALSE_OR_POP: 0,
ops.POP_JUMP_IF_TRUE: -1,
ops.POP_JUMP_IF_FALSE: -1,
- ops.JUMP_IF_NOT_DEBUG: 0,
+ # TODO ops.JUMP_IF_NOT_DEBUG: 0,
- ops.BUILD_LIST_FROM_ARG: 1,
+ # TODO ops.BUILD_LIST_FROM_ARG: 1,
}
diff --git a/pypy/module/sys/version.py b/pypy/module/sys/version.py
--- a/pypy/module/sys/version.py
+++ b/pypy/module/sys/version.py
@@ -6,7 +6,7 @@
from pypy.interpreter import gateway
#XXX # the release serial 42 is not in range(16)
-CPYTHON_VERSION = (3, 3, 5, "final", 0)
+CPYTHON_VERSION = (3, 5, 1, "final", 0)
#XXX # sync CPYTHON_VERSION with patchlevel.h, package.py
CPYTHON_API_VERSION = 1013 #XXX # sync with include/modsupport.h
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
@@ -275,6 +275,7 @@
descr_add, descr_radd = _abstract_binop('add')
descr_sub, descr_rsub = _abstract_binop('sub')
descr_mul, descr_rmul = _abstract_binop('mul')
+ descr_matmul, descr_rmatmul = _abstract_binop('matmul')
descr_and, descr_rand = _abstract_binop('and')
descr_or, descr_ror = _abstract_binop('or')
diff --git a/pypy/tool/lib_pypy.py b/pypy/tool/lib_pypy.py
--- a/pypy/tool/lib_pypy.py
+++ b/pypy/tool/lib_pypy.py
@@ -5,7 +5,7 @@
LIB_ROOT = py.path.local(pypy.__path__[0]).dirpath()
LIB_PYPY = LIB_ROOT.join('lib_pypy')
-LIB_PYTHON = LIB_ROOT.join('lib-python', '%d' % CPYTHON_VERSION[0])
+LIB_PYTHON = LIB_ROOT.join('lib-python', '%d.%d' % CPYTHON_VERSION[0:2])
def import_from_lib_pypy(modname):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
