Author: Jeremy Thurgood <[email protected]>
Branch:
Changeset: r68757:9f9f78e7e299
Date: 2014-01-18 12:07 +0200
http://bitbucket.org/pypy/pypy/changeset/9f9f78e7e299/
Log: increment default_magic for the new co_flag (oops)
diff --git a/pypy/interpreter/pycode.py b/pypy/interpreter/pycode.py
--- a/pypy/interpreter/pycode.py
+++ b/pypy/interpreter/pycode.py
@@ -31,7 +31,7 @@
# Magic numbers for the bytecode version in code objects.
# See comments in pypy/module/imp/importing.
cpython_magic, = struct.unpack("<i", imp.get_magic()) # host magic number
-default_magic = (0xf303 + 6) | 0x0a0d0000 # this PyPy's magic
+default_magic = (0xf303 + 7) | 0x0a0d0000 # this PyPy's magic
# (from CPython 2.7.0)
# cpython_code_signature helper
diff --git a/pypy/module/imp/importing.py b/pypy/module/imp/importing.py
--- a/pypy/module/imp/importing.py
+++ b/pypy/module/imp/importing.py
@@ -837,10 +837,10 @@
# CPython leaves a gap of 10 when it increases its own magic number.
# To avoid assigning exactly the same numbers as CPython, we can pick
# any number between CPython + 2 and CPython + 9. Right now,
-# default_magic = CPython + 6.
+# default_magic = CPython + 7.
#
-# default_magic - 6 -- used by CPython without the -U option
-# default_magic - 5 -- used by CPython with the -U option
+# default_magic - 7 -- used by CPython without the -U option
+# default_magic - 6 -- used by CPython with the -U option
# default_magic -- used by PyPy [because of CALL_METHOD]
#
from pypy.interpreter.pycode import default_magic
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
