[Python-checkins] r79053 - in python/branches/release31-maint: Makefile.pre.in

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Mar 18 22:25:12 2010
New Revision: 79053

Log:
Merged revisions 79052 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r79052 | benjamin.peterson | 2010-03-18 16:23:05 -0500 (Thu, 18 Mar 2010) | 9 lines
  
  Merged revisions 79051 via svnmerge from 
  svn+ssh://pythondev@svn.python.org/python/trunk
  
  ........
    r79051 | benjamin.peterson | 2010-03-18 16:20:35 -0500 (Thu, 18 Mar 2010) | 1 line
    
    don't try to compile anything in lib2to3/tests/data #8169
  ........
................


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Makefile.pre.in

Modified: python/branches/release31-maint/Makefile.pre.in
==============================================================================
--- python/branches/release31-maint/Makefile.pre.in	(original)
+++ python/branches/release31-maint/Makefile.pre.in	Thu Mar 18 22:25:12 2010
@@ -910,12 +910,12 @@
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
 		./$(BUILDPYTHON) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST) -f \
-		-x 'bad_coding|badsyntax|site-packages|py2_test_grammar|crlf|different_encoding' \
+		-x 'badsyntax|site-packages|lib2to3/tests/data' \
 		$(DESTDIR)$(LIBDEST)
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
 		./$(BUILDPYTHON) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST) -f \
-		-x 'bad_coding|badsyntax|site-packages|py2_test_grammar|crlf|different_encoding' \
+		-x 'badsyntax|site-packages|lib2to3/tests/data' \
 		$(DESTDIR)$(LIBDEST)
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
 		./$(BUILDPYTHON) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \