Actually change the MAGIC #. Create a new section for 2.5c1 and mention the impact...

diff --git a/Misc/NEWS b/Misc/NEWS
index b3527654753be49a2be1b7ebc5faa5f96f679b26..114664f12bb0c8399d3b099b3e1ad0387ee1b602 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -4,6 +4,25 @@ Python News
 
 (editors: check NEWS.help for information about editing NEWS using ReST.)
 
+What's New in Python 2.5 release candidate 1?
+=============================================
+
+*Release date: XX-AUG-2006*
+
+Core and builtins
+-----------------
+
+- Bug #1520864: unpacking singleton tuples in for loop (for x, in) work
+  again.  Fixing this problem required changing the .pyc magic number.
+  This means that .pyc files generated before 2.5c1 will be regenerated.
+
+Library
+-------
+
+Extension Modules
+-----------------
+
+
 What's New in Python 2.5 beta 2?
 ================================
 
@@ -12,8 +31,6 @@ What's New in Python 2.5 beta 2?
 Core and builtins
 -----------------
 
-- Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again.
-
 - Bug #1441486: The literal representation of -(sys.maxint - 1)
   again evaluates to a int object, not a long.
 

diff --git a/Python/import.c b/Python/import.c
index dfc25449dd1f8e2bff45ef1c6a6c79773dcfef12..341f652cd01f8e5d1cf3cef8585857b5099c10cb 100644 (file)
--- a/Python/import.c
+++ b/Python/import.c
@@ -63,7 +63,7 @@ extern time_t PyOS_GetLastModificationTime(char *, FILE *);
        Python 2.5c1: 62101 (fix wrong code: for x, in ...)
 .
 */
-#define MAGIC (62092 | ((long)'\r'<<16) | ((long)'\n'<<24))
+#define MAGIC (62101 | ((long)'\r'<<16) | ((long)'\n'<<24))
 
 /* Magic word as global; note that _PyImport_Init() can change the
    value of this global to accommodate for alterations of how the