diff options
| author | Thomas Wouters <thomas@python.org> | 2006-04-21 09:43:23 +0000 |
|---|---|---|
| committer | Thomas Wouters <thomas@python.org> | 2006-04-21 09:43:23 +0000 |
| commit | a4795e7a6f50b2aaab3a761fc2b7614961103824 (patch) | |
| tree | b9d813221c35025ebc9bec036875b73d0597a700 /Python/Python-ast.c | |
| parent | 5b0edfb83b728ff24e4fa0721ed45355cf9c2166 (diff) | |
| download | cpython-a4795e7a6f50b2aaab3a761fc2b7614961103824.tar.gz | |
Merge part of the trunk changes into the p3yk branch. This merges from 43030
(branch-creation time) up to 43067. 43068 and 43069 contain a little
swapping action between re.py and sre.py, and this mightily confuses svn
merge, so later changes are going in separately.
This merge should break no additional tests.
The last-merged revision is going in a 'last_merge' property on '.' (the
branch directory.) Arbitrarily chosen, really; if there's a BCP for this, I
couldn't find it, but we can easily change it afterwards ;)
Diffstat (limited to 'Python/Python-ast.c')
0 files changed, 0 insertions, 0 deletions