[pypy-commit] pypy py3k-qualname: oops, bump the actual magic number that now lives in importlib!

[pjenvey]

Author: Philip Jenvey <pjenvey at underboss.org>
Branch: py3k-qualname
Changeset: r72716:9f0e2a2c6084
Date: 2014-08-07 17:20 -0700
http://bitbucket.org/pypy/pypy/changeset/9f0e2a2c6084/

Log:	oops, bump the actual magic number that now lives in importlib!

diff --git a/lib-python/3/importlib/_bootstrap.py b/lib-python/3/importlib/_bootstrap.py
--- a/lib-python/3/importlib/_bootstrap.py
+++ b/lib-python/3/importlib/_bootstrap.py
@@ -405,7 +405,7 @@
 due to the addition of new opcodes).
 
 """
-_RAW_MAGIC_NUMBER = 3230 | ord('\r') << 16 | ord('\n') << 24
+_RAW_MAGIC_NUMBER = 64 | ord('\r') << 16 | ord('\n') << 24
 _MAGIC_BYTES = bytes(_RAW_MAGIC_NUMBER >> n & 0xff for n in range(0, 25, 8))
 
 _PYCACHE = '__pycache__'
diff --git a/pypy/interpreter/pycode.py b/pypy/interpreter/pycode.py
--- a/pypy/interpreter/pycode.py
+++ b/pypy/interpreter/pycode.py
@@ -36,6 +36,7 @@
 # different value for the highest 16 bits. Bump pypy_incremental_magic every
 # time you make pyc files incompatible
 
+# XXX: the canonical magic is now in importlib._bootstrap!
 pypy_incremental_magic = 64 # bump it by 16
 assert pypy_incremental_magic % 16 == 0
 assert pypy_incremental_magic < 3000 # the magic number of Python 3. There are