mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
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 ;)
This commit is contained in:
parent
d858f70617
commit
a977329b6f
116 changed files with 3409 additions and 709 deletions
|
@ -1,3 +1,6 @@
|
|||
@rem Used by the buildbot "clean" step.
|
||||
call "%VS71COMNTOOLS%vsvars32.bat"
|
||||
devenv.com /clean Debug PCbuild\pcbuild.sln
|
||||
cd PCbuild
|
||||
@echo Deleting .pyc/.pyo files ...
|
||||
python_d.exe rmpyc.py
|
||||
devenv.com /clean Debug pcbuild.sln
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue