diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2006-09-05 03:53:08 +0000 |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2006-09-05 03:53:08 +0000 |
| commit | dac090d3e62cadd24fc6b73ab177bf98326c1849 (patch) | |
| tree | 4b6fa9d21592bdd09ad8204daec1a4bf18c710de /Python/import.c | |
| parent | 4bc2c0919b2ed31851e9c3423ab85614fe35a75a (diff) | |
| download | cpython-git-dac090d3e62cadd24fc6b73ab177bf98326c1849.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.
This code should be refactored to eliminate the duplication. I'm sure
the listcomp/genexpr code can be refactored. I'm not sure if the for loop
can re-use any of the same code though.
Will backport to 2.5 (the only place it matters).
Diffstat (limited to 'Python/import.c')
| -rw-r--r-- | Python/import.c | 3 |
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 |