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.
........

diff --git a/Makefile.pre.in b/Makefile.pre.in
index e3522f7e2fa100efab85dd153a4de73b67f92c3c..30fe44dad5cedd5f984bacc3ce3d105a4110d798 100644 (file)
--- 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):

diff --git a/Misc/NEWS b/Misc/NEWS
index d19984aad3b030fa10358843e33f9cbd5b7a2243..886af2254a22ce3b8995f8a629f4adff030962f0 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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?
 ===========================