[Python-3000-checkins] r65369 - in python/branches/py3k: Makefile.pre.in Misc/NEWS

[martin.v.loewis]

Author: martin.v.loewis
Date: Fri Aug 1 16:15:22 2008
New Revision: 65369

Log:
Merged revisions 65368 via svnmerge from
svn+ssh://pythondev at 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.
........


Modified:
python/branches/py3k/ (props changed)
python/branches/py3k/Makefile.pre.in
python/branches/py3k/Misc/NEWS

Modified: python/branches/py3k/Makefile.pre.in
==============================================================================
--- python/branches/py3k/Makefile.pre.in (original)
+++ python/branches/py3k/Makefile.pre.in Fri Aug 1 16:15:22 2008
@@ -890,7 +890,7 @@
-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):

Modified: python/branches/py3k/Misc/NEWS
==============================================================================
--- python/branches/py3k/Misc/NEWS (original)
+++ python/branches/py3k/Misc/NEWS Fri Aug 1 16:15:22 2008
@@ -26,9 +26,22 @@
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?
===========================