commit 081a38d6783a301f7486585cff88f106da52dd71
author Benjamin Peterson <benjamin@python.org> Thu Mar 18 23:01:29 2010 +0000
committer Benjamin Peterson <benjamin@python.org> Thu Mar 18 23:01:29 2010 +0000
tree c43aa0bc88c2684700e01343d4aff420a40e3a4c
parent 5ff5336842dd4752b004eedc53978e2dee36466b

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

................
  r79075 | benjamin.peterson | 2010-03-18 17:58:19 -0500 (Thu, 18 Mar 2010) | 9 lines

  Merged revisions 79073 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r79073 | benjamin.peterson | 2010-03-18 17:55:46 -0500 (Thu, 18 Mar 2010) | 1 line

    reignore bad_coding
  ........
................

Makefile.pre.in

diff --git a/Makefile.pre.in b/Makefile.pre.in
index 82b056c..e280dc4 100644
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -911,12 +911,12 @@
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
 		./$(BUILDPYTHON) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST) -f \
-		-x 'badsyntax|site-packages|lib2to3/tests/data' \
+		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
 		$(DESTDIR)$(LIBDEST)
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST) $(RUNSHARED) \
 		./$(BUILDPYTHON) -Wi -O $(DESTDIR)$(LIBDEST)/compileall.py \
 		-d $(LIBDEST) -f \
-		-x 'badsyntax|site-packages|lib2to3/tests/data' \
+		-x 'bad_coding|badsyntax|site-packages|lib2to3/tests/data' \
 		$(DESTDIR)$(LIBDEST)
 	-PYTHONPATH=$(DESTDIR)$(LIBDEST)  $(RUNSHARED) \
 		./$(BUILDPYTHON) -Wi $(DESTDIR)$(LIBDEST)/compileall.py \