diff options
| author | Martin v. Löwis <martin@v.loewis.de> | 2008-08-01 14:15:22 (GMT) |
|---|---|---|
| committer | Martin v. Löwis <martin@v.loewis.de> | 2008-08-01 14:15:22 (GMT) |
| commit | 4fe5ed8f258652c22b182f22478f5edb42f71382 (patch) | |
| tree | 9777f55b9335d5ca7974a7d8b2d3abf4b78e67f6 | |
| parent | 4aab7119b7293b22c8877bb84593a2510457a626 (diff) | |
| download | cpython-4fe5ed8f258652c22b182f22478f5edb42f71382.zip cpython-4fe5ed8f258652c22b182f22478f5edb42f71382.tar.gz cpython-4fe5ed8f258652c22b182f22478f5edb42f71382.tar.bz2 | |
Merged revisions 65368 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65368 | martin.v.loewis | 2008-08-01 16:10:26 +0200 (Fr, 01 Aug 2008) | 3 lines
Generate the PatternGrammar pickle during "make install".
Fixes part of #3131.
........
| -rw-r--r-- | Makefile.pre.in | 2 | ||||
| -rw-r--r-- | Misc/NEWS | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/Makefile.pre.in b/Makefile.pre.in index e3522f7..30fe44d 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -890,7 +890,7 @@ libinstall: build_all $(srcdir)/Lib/$(PLATDIR) -d $(LIBDEST)/site-packages -f \ -x badsyntax $(DESTDIR)$(LIBDEST)/site-packages -PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \ - ./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram" + ./$(BUILDPYTHON) -Wi -c "import lib2to3.pygram, lib2to3.patcomp;lib2to3.patcomp.PatternCompiler()" # Create the PLATDIR source directory, if one wasn't distributed.. $(srcdir)/Lib/$(PLATDIR): @@ -26,9 +26,22 @@ Library file name rather than a ZipInfo instance, so files are extracted with mode 0600 rather than 000 under Unix. +<<<<<<< .working - Issue #2523: Fix quadratic behaviour when read()ing a binary file without asking for a specific length. +======= +Build +----- +>>>>>>> .merge-right.r65368 + +<<<<<<< .working +======= +- Generate the PatternGrammar pickle during "make install". + +What's New in Python 2.6 beta 2? +================================ +>>>>>>> .merge-right.r65368 What's new in Python 3.0b2? =========================== |