summaryrefslogtreecommitdiff
path: root/Python/import.c
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-09-05 03:56:01 +0000
committerNeal Norwitz <nnorwitz@gmail.com>2006-09-05 03:56:01 +0000
commit3b3aae013b158114fdc90a72355d2d9b1b434875 (patch)
treeae53663bc7081e890b6f731b740d04abba15daf0 /Python/import.c
parent541a48b262a099d55298e32f62d8b1f4a0b97e8e (diff)
downloadcpython-git-3b3aae013b158114fdc90a72355d2d9b1b434875.tar.gz
Bug #1520864 (again): unpacking singleton tuples in list comprehensions and
generator expressions (x for x, in ... ) works again. Sigh, I only fixed for loops the first time, not list comps and genexprs too. I couldn't find any more unpacking cases where there is a similar bug lurking.
Diffstat (limited to 'Python/import.c')
-rw-r--r--Python/import.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/Python/import.c b/Python/import.c
index da9de8b64f..a0c5055142 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -64,9 +64,10 @@ extern time_t PyOS_GetLastModificationTime(char *, FILE *);
Python 2.5b3: 62111 (fix wrong code: x += yield)
Python 2.5c1: 62121 (fix wrong lnotab with for loops and
storing constants that should have been removed)
+ Python 2.5c2: 62131 (fix wrong code: for x, in ... in listcomp/genexp)
.
*/
-#define MAGIC (62121 | ((long)'\r'<<16) | ((long)'\n'<<24))
+#define MAGIC (62131 | ((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