Thu Mar 11 23:53:47 CET 2010

Author: benjamin.peterson
Date: Thu Mar 11 23:53:45 2010
New Revision: 78850

Log:
convert shebang lines: python -> python3

Modified:
   python/branches/py3k/Demo/cgi/cgi1.py
   python/branches/py3k/Demo/cgi/cgi2.py
   python/branches/py3k/Demo/cgi/cgi3.py
   python/branches/py3k/Demo/comparisons/regextest.py
   python/branches/py3k/Demo/comparisons/sortingtest.py
   python/branches/py3k/Demo/comparisons/systemtest.py
   python/branches/py3k/Demo/curses/life.py
   python/branches/py3k/Demo/curses/ncurses.py
   python/branches/py3k/Demo/curses/rain.py
   python/branches/py3k/Demo/curses/repeat.py
   python/branches/py3k/Demo/curses/tclock.py
   python/branches/py3k/Demo/distutils/test2to3/maintest.py
   python/branches/py3k/Demo/parser/test_parser.py
   python/branches/py3k/Demo/pdist/RCSProxy.py
   python/branches/py3k/Demo/pdist/makechangelog.py
   python/branches/py3k/Demo/pdist/rcvs.py
   python/branches/py3k/Demo/pdist/rrcs.py
   python/branches/py3k/Demo/pysvr/pysvr.py
   python/branches/py3k/Demo/scripts/beer.py
   python/branches/py3k/Demo/scripts/eqfix.py
   python/branches/py3k/Demo/scripts/fact.py
   python/branches/py3k/Demo/scripts/find-uname.py
   python/branches/py3k/Demo/scripts/from.py
   python/branches/py3k/Demo/scripts/lpwatch.py
   python/branches/py3k/Demo/scripts/makedir.py
   python/branches/py3k/Demo/scripts/markov.py
   python/branches/py3k/Demo/scripts/mboxconvert.py
   python/branches/py3k/Demo/scripts/morse.py
   python/branches/py3k/Demo/scripts/newslist.py
   python/branches/py3k/Demo/scripts/pi.py
   python/branches/py3k/Demo/scripts/pp.py
   python/branches/py3k/Demo/scripts/primes.py
   python/branches/py3k/Demo/scripts/queens.py
   python/branches/py3k/Demo/scripts/script.py
   python/branches/py3k/Demo/scripts/unbirthday.py
   python/branches/py3k/Demo/scripts/update.py
   python/branches/py3k/Demo/sockets/echosvr.py
   python/branches/py3k/Demo/sockets/finger.py
   python/branches/py3k/Demo/sockets/gopher.py
   python/branches/py3k/Demo/sockets/mcast.py
   python/branches/py3k/Demo/sockets/rpython.py
   python/branches/py3k/Demo/sockets/rpythond.py
   python/branches/py3k/Demo/sockets/telnet.py
   python/branches/py3k/Demo/sockets/throughput.py
   python/branches/py3k/Demo/sockets/udpecho.py
   python/branches/py3k/Demo/tkinter/guido/MimeViewer.py
   python/branches/py3k/Demo/tkinter/guido/canvasevents.py
   python/branches/py3k/Demo/tkinter/guido/dialog.py
   python/branches/py3k/Demo/tkinter/guido/electrons.py
   python/branches/py3k/Demo/tkinter/guido/kill.py
   python/branches/py3k/Demo/tkinter/guido/mbox.py
   python/branches/py3k/Demo/tkinter/guido/newmenubardemo.py
   python/branches/py3k/Demo/tkinter/guido/rmt.py
   python/branches/py3k/Demo/tkinter/guido/solitaire.py
   python/branches/py3k/Demo/tkinter/guido/sortvisu.py
   python/branches/py3k/Demo/tkinter/guido/svkill.py
   python/branches/py3k/Demo/tkinter/guido/tkman.py
   python/branches/py3k/Demo/turtle/tdemo_I_dontlike_tiltdemo.py
   python/branches/py3k/Demo/turtle/tdemo_bytedesign.py
   python/branches/py3k/Demo/turtle/tdemo_clock.py
   python/branches/py3k/Demo/turtle/tdemo_forest.py
   python/branches/py3k/Demo/turtle/tdemo_fractalcurves.py
   python/branches/py3k/Demo/turtle/tdemo_lindenmayer_indian.py
   python/branches/py3k/Demo/turtle/tdemo_minimal_hanoi.py
   python/branches/py3k/Demo/turtle/tdemo_paint.py
   python/branches/py3k/Demo/turtle/tdemo_peace.py
   python/branches/py3k/Demo/turtle/tdemo_penrose.py
   python/branches/py3k/Demo/turtle/tdemo_planet_and_moon.py
   python/branches/py3k/Demo/turtle/tdemo_tree.py
   python/branches/py3k/Demo/turtle/tdemo_yinyang.py
   python/branches/py3k/Demo/turtle/turtleDemo.py
   python/branches/py3k/Demo/turtle/turtledemo_two_canvases.py
   python/branches/py3k/Demo/zlib/minigzip.py
   python/branches/py3k/Demo/zlib/zlibdemo.py
   python/branches/py3k/Doc/includes/email-alternative.py
   python/branches/py3k/Doc/includes/email-dir.py
   python/branches/py3k/Doc/includes/email-unpack.py
   python/branches/py3k/Doc/tools/rstlint.py
   python/branches/py3k/Lib/base64.py
   python/branches/py3k/Lib/cProfile.py
   python/branches/py3k/Lib/difflib.py
   python/branches/py3k/Lib/http/cookies.py
   python/branches/py3k/Lib/idlelib/PyShell.py
   python/branches/py3k/Lib/keyword.py
   python/branches/py3k/Lib/lib2to3/pgen2/token.py
   python/branches/py3k/Lib/lib2to3/tests/pytree_idempotency.py
   python/branches/py3k/Lib/mailbox.py
   python/branches/py3k/Lib/pdb.py
   python/branches/py3k/Lib/platform.py
   python/branches/py3k/Lib/profile.py
   python/branches/py3k/Lib/pydoc.py
   python/branches/py3k/Lib/quopri.py
   python/branches/py3k/Lib/smtpd.py
   python/branches/py3k/Lib/smtplib.py
   python/branches/py3k/Lib/symbol.py
   python/branches/py3k/Lib/tabnanny.py
   python/branches/py3k/Lib/tarfile.py
   python/branches/py3k/Lib/test/crashers/recursive_call.py
   python/branches/py3k/Lib/test/curses_tests.py
   python/branches/py3k/Lib/test/pystone.py
   python/branches/py3k/Lib/test/re_tests.py
   python/branches/py3k/Lib/test/regrtest.py
   python/branches/py3k/Lib/test/test___future__.py
   python/branches/py3k/Lib/test/test_array.py
   python/branches/py3k/Lib/test/test_binhex.py
   python/branches/py3k/Lib/test/test_bz2.py
   python/branches/py3k/Lib/test/test_cmd.py
   python/branches/py3k/Lib/test/test_codecencodings_cn.py
   python/branches/py3k/Lib/test/test_codecencodings_hk.py
   python/branches/py3k/Lib/test/test_codecencodings_jp.py
   python/branches/py3k/Lib/test/test_codecencodings_kr.py
   python/branches/py3k/Lib/test/test_codecencodings_tw.py
   python/branches/py3k/Lib/test/test_codecmaps_cn.py
   python/branches/py3k/Lib/test/test_codecmaps_hk.py
   python/branches/py3k/Lib/test/test_codecmaps_jp.py
   python/branches/py3k/Lib/test/test_codecmaps_kr.py
   python/branches/py3k/Lib/test/test_codecmaps_tw.py
   python/branches/py3k/Lib/test/test_dbm.py
   python/branches/py3k/Lib/test/test_dbm_dumb.py
   python/branches/py3k/Lib/test/test_eof.py
   python/branches/py3k/Lib/test/test_errno.py
   python/branches/py3k/Lib/test/test_gzip.py
   python/branches/py3k/Lib/test/test_keywordonlyarg.py
   python/branches/py3k/Lib/test/test_logging.py
   python/branches/py3k/Lib/test/test_marshal.py
   python/branches/py3k/Lib/test/test_multibytecodec.py
   python/branches/py3k/Lib/test/test_multibytecodec_support.py
   python/branches/py3k/Lib/test/test_multiprocessing.py
   python/branches/py3k/Lib/test/test_popen.py
   python/branches/py3k/Lib/test/test_random.py
   python/branches/py3k/Lib/test/test_smtpnet.py
   python/branches/py3k/Lib/test/test_socket.py
   python/branches/py3k/Lib/test/test_tcl.py
   python/branches/py3k/Lib/test/test_urllib2_localnet.py
   python/branches/py3k/Lib/test/test_urllib2net.py
   python/branches/py3k/Lib/test/test_urllibnet.py
   python/branches/py3k/Lib/test/test_urlparse.py
   python/branches/py3k/Lib/test/test_userstring.py
   python/branches/py3k/Lib/test/test_with.py
   python/branches/py3k/Lib/test/test_xmlrpc_net.py
   python/branches/py3k/Lib/timeit.py
   python/branches/py3k/Lib/token.py
   python/branches/py3k/Lib/trace.py
   python/branches/py3k/Lib/uu.py
   python/branches/py3k/Lib/webbrowser.py
   python/branches/py3k/Python/makeopcodetargets.py
   python/branches/py3k/Tools/faqwiz/faqw.py
   python/branches/py3k/Tools/freeze/freeze.py
   python/branches/py3k/Tools/i18n/makelocalealias.py
   python/branches/py3k/Tools/i18n/msgfmt.py
   python/branches/py3k/Tools/i18n/pygettext.py
   python/branches/py3k/Tools/modulator/Tkextra.py
   python/branches/py3k/Tools/modulator/modulator.py
   python/branches/py3k/Tools/scripts/byteyears.py
   python/branches/py3k/Tools/scripts/checkappend.py
   python/branches/py3k/Tools/scripts/checkpyc.py
   python/branches/py3k/Tools/scripts/classfix.py
   python/branches/py3k/Tools/scripts/cleanfuture.py
   python/branches/py3k/Tools/scripts/combinerefs.py
   python/branches/py3k/Tools/scripts/copytime.py
   python/branches/py3k/Tools/scripts/crlf.py
   python/branches/py3k/Tools/scripts/cvsfiles.py
   python/branches/py3k/Tools/scripts/db2pickle.py
   python/branches/py3k/Tools/scripts/dutree.py
   python/branches/py3k/Tools/scripts/eptags.py
   python/branches/py3k/Tools/scripts/find_recursionlimit.py
   python/branches/py3k/Tools/scripts/finddiv.py
   python/branches/py3k/Tools/scripts/findlinksto.py
   python/branches/py3k/Tools/scripts/findnocoding.py
   python/branches/py3k/Tools/scripts/fixcid.py
   python/branches/py3k/Tools/scripts/fixdiv.py
   python/branches/py3k/Tools/scripts/fixheader.py
   python/branches/py3k/Tools/scripts/fixnotice.py
   python/branches/py3k/Tools/scripts/fixps.py
   python/branches/py3k/Tools/scripts/ftpmirror.py
   python/branches/py3k/Tools/scripts/google.py
   python/branches/py3k/Tools/scripts/gprof2html.py
   python/branches/py3k/Tools/scripts/h2py.py
   python/branches/py3k/Tools/scripts/ifdef.py
   python/branches/py3k/Tools/scripts/lfcr.py
   python/branches/py3k/Tools/scripts/linktree.py
   python/branches/py3k/Tools/scripts/lll.py
   python/branches/py3k/Tools/scripts/logmerge.py
   python/branches/py3k/Tools/scripts/md5sum.py
   python/branches/py3k/Tools/scripts/methfix.py
   python/branches/py3k/Tools/scripts/mkreal.py
   python/branches/py3k/Tools/scripts/ndiff.py
   python/branches/py3k/Tools/scripts/nm2def.py
   python/branches/py3k/Tools/scripts/objgraph.py
   python/branches/py3k/Tools/scripts/parseentities.py
   python/branches/py3k/Tools/scripts/pdeps.py
   python/branches/py3k/Tools/scripts/pickle2db.py
   python/branches/py3k/Tools/scripts/pindent.py
   python/branches/py3k/Tools/scripts/ptags.py
   python/branches/py3k/Tools/scripts/pysource.py
   python/branches/py3k/Tools/scripts/reindent-rst.py
   python/branches/py3k/Tools/scripts/reindent.py
   python/branches/py3k/Tools/scripts/rgrep.py
   python/branches/py3k/Tools/scripts/serve.py
   python/branches/py3k/Tools/scripts/suff.py
   python/branches/py3k/Tools/scripts/svneol.py
   python/branches/py3k/Tools/scripts/texi2html.py
   python/branches/py3k/Tools/scripts/treesync.py
   python/branches/py3k/Tools/scripts/untabify.py
   python/branches/py3k/Tools/scripts/which.py
   python/branches/py3k/Tools/scripts/xxci.py
   python/branches/py3k/Tools/ssl/get-remote-certificate.py
   python/branches/py3k/Tools/unicode/comparecodecs.py
   python/branches/py3k/Tools/webchecker/wcgui.py
   python/branches/py3k/Tools/webchecker/webchecker.py
   python/branches/py3k/Tools/webchecker/websucker.py
   python/branches/py3k/Tools/webchecker/wsgui.py

Modified: python/branches/py3k/Demo/cgi/cgi1.py
==============================================================================

--- python/branches/py3k/Demo/cgi/cgi1.py	(original)
+++ python/branches/py3k/Demo/cgi/cgi1.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/env python3
 
 """CGI test 1 - check server setup."""
 

Modified: python/branches/py3k/Demo/cgi/cgi2.py
==============================================================================
--- python/branches/py3k/Demo/cgi/cgi2.py	(original)
+++ python/branches/py3k/Demo/cgi/cgi2.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/env python3
 
 """CGI test 2 - basic use of cgi module."""
 

Modified: python/branches/py3k/Demo/cgi/cgi3.py
==============================================================================
--- python/branches/py3k/Demo/cgi/cgi3.py	(original)
+++ python/branches/py3k/Demo/cgi/cgi3.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/env python3
 
 """CGI test 3 (persistent data)."""
 

Modified: python/branches/py3k/Demo/comparisons/regextest.py
==============================================================================
--- python/branches/py3k/Demo/comparisons/regextest.py	(original)
+++ python/branches/py3k/Demo/comparisons/regextest.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # 1)  Regular Expressions Test
 #

Modified: python/branches/py3k/Demo/comparisons/sortingtest.py
==============================================================================
--- python/branches/py3k/Demo/comparisons/sortingtest.py	(original)
+++ python/branches/py3k/Demo/comparisons/sortingtest.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # 2)  Sorting Test
 #

Modified: python/branches/py3k/Demo/comparisons/systemtest.py
==============================================================================
--- python/branches/py3k/Demo/comparisons/systemtest.py	(original)
+++ python/branches/py3k/Demo/comparisons/systemtest.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # 3)  System Test
 #

Modified: python/branches/py3k/Demo/curses/life.py
==============================================================================
--- python/branches/py3k/Demo/curses/life.py	(original)
+++ python/branches/py3k/Demo/curses/life.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # life.py -- A curses-based version of Conway's Game of Life.
 # Contributed by AMK
 #

Modified: python/branches/py3k/Demo/curses/ncurses.py
==============================================================================
--- python/branches/py3k/Demo/curses/ncurses.py	(original)
+++ python/branches/py3k/Demo/curses/ncurses.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # $Id$
 #

Modified: python/branches/py3k/Demo/curses/rain.py
==============================================================================
--- python/branches/py3k/Demo/curses/rain.py	(original)
+++ python/branches/py3k/Demo/curses/rain.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # $Id$
 #

Modified: python/branches/py3k/Demo/curses/repeat.py
==============================================================================
--- python/branches/py3k/Demo/curses/repeat.py	(original)
+++ python/branches/py3k/Demo/curses/repeat.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """repeat [-i SECONDS] <shell-command>
 

Modified: python/branches/py3k/Demo/curses/tclock.py
==============================================================================
--- python/branches/py3k/Demo/curses/tclock.py	(original)
+++ python/branches/py3k/Demo/curses/tclock.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # $Id$
 #

Modified: python/branches/py3k/Demo/distutils/test2to3/maintest.py
==============================================================================
--- python/branches/py3k/Demo/distutils/test2to3/maintest.py	(original)
+++ python/branches/py3k/Demo/distutils/test2to3/maintest.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # The above line should get replaced with the path to the Python
 # interpreter; the block below should get 2to3-converted.

Modified: python/branches/py3k/Demo/parser/test_parser.py
==============================================================================
--- python/branches/py3k/Demo/parser/test_parser.py	(original)
+++ python/branches/py3k/Demo/parser/test_parser.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #  (Force the script to use the latest build.)
 #
 #  test_parser.py

Modified: python/branches/py3k/Demo/pdist/RCSProxy.py
==============================================================================
--- python/branches/py3k/Demo/pdist/RCSProxy.py	(original)
+++ python/branches/py3k/Demo/pdist/RCSProxy.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """RCS Proxy.
 

Modified: python/branches/py3k/Demo/pdist/makechangelog.py
==============================================================================
--- python/branches/py3k/Demo/pdist/makechangelog.py	(original)
+++ python/branches/py3k/Demo/pdist/makechangelog.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Turn a pile of RCS log output into ChangeLog file entries.
 

Modified: python/branches/py3k/Demo/pdist/rcvs.py
==============================================================================
--- python/branches/py3k/Demo/pdist/rcvs.py	(original)
+++ python/branches/py3k/Demo/pdist/rcvs.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Remote CVS -- command line interface"""
 

Modified: python/branches/py3k/Demo/pdist/rrcs.py
==============================================================================
--- python/branches/py3k/Demo/pdist/rrcs.py	(original)
+++ python/branches/py3k/Demo/pdist/rrcs.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 "Remote RCS -- command line interface"
 

Modified: python/branches/py3k/Demo/pysvr/pysvr.py
==============================================================================
--- python/branches/py3k/Demo/pysvr/pysvr.py	(original)
+++ python/branches/py3k/Demo/pysvr/pysvr.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """A multi-threaded telnet-like server that gives a Python prompt.
 

Modified: python/branches/py3k/Demo/scripts/beer.py
==============================================================================
--- python/branches/py3k/Demo/scripts/beer.py	(original)
+++ python/branches/py3k/Demo/scripts/beer.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # By GvR, demystified after a version by Fredrik Lundh.
 

Modified: python/branches/py3k/Demo/scripts/eqfix.py
==============================================================================
--- python/branches/py3k/Demo/scripts/eqfix.py	(original)
+++ python/branches/py3k/Demo/scripts/eqfix.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Fix Python source files to use the new equality test operator, i.e.,
 #       if x = y: ...

Modified: python/branches/py3k/Demo/scripts/fact.py
==============================================================================
--- python/branches/py3k/Demo/scripts/fact.py	(original)
+++ python/branches/py3k/Demo/scripts/fact.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Factorize numbers.
 # The algorithm is not efficient, but easy to understand.

Modified: python/branches/py3k/Demo/scripts/find-uname.py
==============================================================================
--- python/branches/py3k/Demo/scripts/find-uname.py	(original)
+++ python/branches/py3k/Demo/scripts/find-uname.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 For each argument on the command line, look for it in the set of all Unicode

Modified: python/branches/py3k/Demo/scripts/from.py
==============================================================================
--- python/branches/py3k/Demo/scripts/from.py	(original)
+++ python/branches/py3k/Demo/scripts/from.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Print From and Subject of messages in $MAIL.
 # Extension to multiple mailboxes and other bells & whistles are left

Modified: python/branches/py3k/Demo/scripts/lpwatch.py
==============================================================================
--- python/branches/py3k/Demo/scripts/lpwatch.py	(original)
+++ python/branches/py3k/Demo/scripts/lpwatch.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Watch line printer queue(s).
 # Intended for BSD 4.3 lpq.

Modified: python/branches/py3k/Demo/scripts/makedir.py
==============================================================================
--- python/branches/py3k/Demo/scripts/makedir.py	(original)
+++ python/branches/py3k/Demo/scripts/makedir.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Like mkdir, but also make intermediate directories if necessary.
 # It is not an error if the given directory already exists (as long

Modified: python/branches/py3k/Demo/scripts/markov.py
==============================================================================
--- python/branches/py3k/Demo/scripts/markov.py	(original)
+++ python/branches/py3k/Demo/scripts/markov.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 class Markov:
     def __init__(self, histsize, choice):

Modified: python/branches/py3k/Demo/scripts/mboxconvert.py
==============================================================================
--- python/branches/py3k/Demo/scripts/mboxconvert.py	(original)
+++ python/branches/py3k/Demo/scripts/mboxconvert.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Convert  MH directories (1 message per file) or MMDF mailboxes (4x^A
 # delimited) to unix mailbox (From ... delimited) on stdout.

Modified: python/branches/py3k/Demo/scripts/morse.py
==============================================================================
--- python/branches/py3k/Demo/scripts/morse.py	(original)
+++ python/branches/py3k/Demo/scripts/morse.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # DAH should be three DOTs.
 # Space between DOTs and DAHs should be one DOT.

Modified: python/branches/py3k/Demo/scripts/newslist.py
==============================================================================
--- python/branches/py3k/Demo/scripts/newslist.py	(original)
+++ python/branches/py3k/Demo/scripts/newslist.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #######################################################################
 # Newslist  $Revision$
 #

Modified: python/branches/py3k/Demo/scripts/pi.py
==============================================================================
--- python/branches/py3k/Demo/scripts/pi.py	(original)
+++ python/branches/py3k/Demo/scripts/pi.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Print digits of pi forever.
 #

Modified: python/branches/py3k/Demo/scripts/pp.py
==============================================================================
--- python/branches/py3k/Demo/scripts/pp.py	(original)
+++ python/branches/py3k/Demo/scripts/pp.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Emulate some Perl command line options.
 # Usage: pp [-a] [-c] [-d] [-e scriptline] [-F fieldsep] [-n] [-p] [file] ...

Modified: python/branches/py3k/Demo/scripts/primes.py
==============================================================================
--- python/branches/py3k/Demo/scripts/primes.py	(original)
+++ python/branches/py3k/Demo/scripts/primes.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Print prime numbers in a given range
 

Modified: python/branches/py3k/Demo/scripts/queens.py
==============================================================================
--- python/branches/py3k/Demo/scripts/queens.py	(original)
+++ python/branches/py3k/Demo/scripts/queens.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """N queens problem.
 

Modified: python/branches/py3k/Demo/scripts/script.py
==============================================================================
--- python/branches/py3k/Demo/scripts/script.py	(original)
+++ python/branches/py3k/Demo/scripts/script.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # script.py -- Make typescript of terminal session.
 # Usage:

Modified: python/branches/py3k/Demo/scripts/unbirthday.py
==============================================================================
--- python/branches/py3k/Demo/scripts/unbirthday.py	(original)
+++ python/branches/py3k/Demo/scripts/unbirthday.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Calculate your unbirthday count (see Alice in Wonderland).
 # This is defined as the number of days from your birth until today

Modified: python/branches/py3k/Demo/scripts/update.py
==============================================================================
--- python/branches/py3k/Demo/scripts/update.py	(original)
+++ python/branches/py3k/Demo/scripts/update.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Update a bunch of files according to a script.
 # The input file contains lines of the form <filename>:<lineno>:<text>,

Modified: python/branches/py3k/Demo/sockets/echosvr.py
==============================================================================
--- python/branches/py3k/Demo/sockets/echosvr.py	(original)
+++ python/branches/py3k/Demo/sockets/echosvr.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Python implementation of an 'echo' tcp server: echo all data it receives.
 #

Modified: python/branches/py3k/Demo/sockets/finger.py
==============================================================================
--- python/branches/py3k/Demo/sockets/finger.py	(original)
+++ python/branches/py3k/Demo/sockets/finger.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Python interface to the Internet finger daemon.
 #

Modified: python/branches/py3k/Demo/sockets/gopher.py
==============================================================================
--- python/branches/py3k/Demo/sockets/gopher.py	(original)
+++ python/branches/py3k/Demo/sockets/gopher.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # A simple gopher client.
 #

Modified: python/branches/py3k/Demo/sockets/mcast.py
==============================================================================
--- python/branches/py3k/Demo/sockets/mcast.py	(original)
+++ python/branches/py3k/Demo/sockets/mcast.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Send/receive UDP multicast packets.
 # Requires that your OS kernel supports IP multicast.

Modified: python/branches/py3k/Demo/sockets/rpython.py
==============================================================================
--- python/branches/py3k/Demo/sockets/rpython.py	(original)
+++ python/branches/py3k/Demo/sockets/rpython.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Remote python client.
 # Execute Python commands remotely and send output back.

Modified: python/branches/py3k/Demo/sockets/rpythond.py
==============================================================================
--- python/branches/py3k/Demo/sockets/rpythond.py	(original)
+++ python/branches/py3k/Demo/sockets/rpythond.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Remote python server.
 # Execute Python commands remotely and send output back.

Modified: python/branches/py3k/Demo/sockets/telnet.py
==============================================================================
--- python/branches/py3k/Demo/sockets/telnet.py	(original)
+++ python/branches/py3k/Demo/sockets/telnet.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Minimal interface to the Internet telnet protocol.
 #

Modified: python/branches/py3k/Demo/sockets/throughput.py
==============================================================================
--- python/branches/py3k/Demo/sockets/throughput.py	(original)
+++ python/branches/py3k/Demo/sockets/throughput.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Test network throughput.
 #

Modified: python/branches/py3k/Demo/sockets/udpecho.py
==============================================================================
--- python/branches/py3k/Demo/sockets/udpecho.py	(original)
+++ python/branches/py3k/Demo/sockets/udpecho.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Client and server for udp (datagram) echo.
 #

Modified: python/branches/py3k/Demo/tkinter/guido/MimeViewer.py
==============================================================================
--- python/branches/py3k/Demo/tkinter/guido/MimeViewer.py	(original)
+++ python/branches/py3k/Demo/tkinter/guido/MimeViewer.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # View a single MIME multipart message.
 # Display each part as a box.

Modified: python/branches/py3k/Demo/tkinter/guido/canvasevents.py
==============================================================================
--- python/branches/py3k/Demo/tkinter/guido/canvasevents.py	(original)
+++ python/branches/py3k/Demo/tkinter/guido/canvasevents.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 from tkinter import *
 from Canvas import Oval, Group, CanvasText

Modified: python/branches/py3k/Demo/tkinter/guido/dialog.py
==============================================================================
--- python/branches/py3k/Demo/tkinter/guido/dialog.py	(original)
+++ python/branches/py3k/Demo/tkinter/guido/dialog.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # A Python function that generates dialog boxes with a text message,
 # optional bitmap, and any number of buttons.

Modified: python/branches/py3k/Demo/tkinter/guido/electrons.py
==============================================================================
--- python/branches/py3k/Demo/tkinter/guido/electrons.py	(original)
+++ python/branches/py3k/Demo/tkinter/guido/electrons.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Simulate "electrons" migrating across the screen.
 # An optional bitmap file in can be in the background.

Modified: python/branches/py3k/Demo/tkinter/guido/kill.py
==============================================================================
--- python/branches/py3k/Demo/tkinter/guido/kill.py	(original)
+++ python/branches/py3k/Demo/tkinter/guido/kill.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 # Tkinter interface to Linux `kill' command.
 
 from tkinter import *

Modified: python/branches/py3k/Demo/tkinter/guido/mbox.py
==============================================================================
--- python/branches/py3k/Demo/tkinter/guido/mbox.py	(original)
+++ python/branches/py3k/Demo/tkinter/guido/mbox.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Scan MH folder, display results in window
 

Modified: python/branches/py3k/Demo/tkinter/guido/newmenubardemo.py
==============================================================================
--- python/branches/py3k/Demo/tkinter/guido/newmenubardemo.py	(original)
+++ python/branches/py3k/Demo/tkinter/guido/newmenubardemo.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Play with the new Tk 8.0 toplevel menu option."""
 

Modified: python/branches/py3k/Demo/tkinter/guido/rmt.py
==============================================================================
--- python/branches/py3k/Demo/tkinter/guido/rmt.py	(original)
+++ python/branches/py3k/Demo/tkinter/guido/rmt.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # A Python program implementing rmt, an application for remotely
 # controlling other Tk applications.

Modified: python/branches/py3k/Demo/tkinter/guido/solitaire.py
==============================================================================
--- python/branches/py3k/Demo/tkinter/guido/solitaire.py	(original)
+++ python/branches/py3k/Demo/tkinter/guido/solitaire.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Solitaire game, much like the one that comes with MS Windows.
 

Modified: python/branches/py3k/Demo/tkinter/guido/sortvisu.py
==============================================================================
--- python/branches/py3k/Demo/tkinter/guido/sortvisu.py	(original)
+++ python/branches/py3k/Demo/tkinter/guido/sortvisu.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Sorting algorithms visualizer using Tkinter.
 

Modified: python/branches/py3k/Demo/tkinter/guido/svkill.py
==============================================================================
--- python/branches/py3k/Demo/tkinter/guido/svkill.py	(original)
+++ python/branches/py3k/Demo/tkinter/guido/svkill.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Tkinter interface to SYSV `ps' and `kill' commands.
 

Modified: python/branches/py3k/Demo/tkinter/guido/tkman.py
==============================================================================
--- python/branches/py3k/Demo/tkinter/guido/tkman.py	(original)
+++ python/branches/py3k/Demo/tkinter/guido/tkman.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Tk man page browser -- currently only shows the Tcl/Tk man pages
 

Modified: python/branches/py3k/Demo/turtle/tdemo_I_dontlike_tiltdemo.py
==============================================================================
--- python/branches/py3k/Demo/turtle/tdemo_I_dontlike_tiltdemo.py	(original)
+++ python/branches/py3k/Demo/turtle/tdemo_I_dontlike_tiltdemo.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 """       turtle-example-suite:
 
      tdemo-I_dont_like_tiltdemo.py

Modified: python/branches/py3k/Demo/turtle/tdemo_bytedesign.py
==============================================================================
--- python/branches/py3k/Demo/turtle/tdemo_bytedesign.py	(original)
+++ python/branches/py3k/Demo/turtle/tdemo_bytedesign.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 """      turtle-example-suite:
 
         tdemo_bytedesign.py

Modified: python/branches/py3k/Demo/turtle/tdemo_clock.py
==============================================================================
--- python/branches/py3k/Demo/turtle/tdemo_clock.py	(original)
+++ python/branches/py3k/Demo/turtle/tdemo_clock.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # -*- coding: cp1252 -*-
 """       turtle-example-suite:
 

Modified: python/branches/py3k/Demo/turtle/tdemo_forest.py
==============================================================================
--- python/branches/py3k/Demo/turtle/tdemo_forest.py	(original)
+++ python/branches/py3k/Demo/turtle/tdemo_forest.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 """     turtlegraphics-example-suite:
 
              tdemo_forest.py

Modified: python/branches/py3k/Demo/turtle/tdemo_fractalcurves.py
==============================================================================
--- python/branches/py3k/Demo/turtle/tdemo_fractalcurves.py	(original)
+++ python/branches/py3k/Demo/turtle/tdemo_fractalcurves.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 """      turtle-example-suite:
 
         tdemo_fractalCurves.py

Modified: python/branches/py3k/Demo/turtle/tdemo_lindenmayer_indian.py
==============================================================================
--- python/branches/py3k/Demo/turtle/tdemo_lindenmayer_indian.py	(original)
+++ python/branches/py3k/Demo/turtle/tdemo_lindenmayer_indian.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 """       turtle-example-suite:
 
         xtx_lindenmayer_indian.py

Modified: python/branches/py3k/Demo/turtle/tdemo_minimal_hanoi.py
==============================================================================
--- python/branches/py3k/Demo/turtle/tdemo_minimal_hanoi.py	(original)
+++ python/branches/py3k/Demo/turtle/tdemo_minimal_hanoi.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 """       turtle-example-suite:
 
          tdemo_minimal_hanoi.py

Modified: python/branches/py3k/Demo/turtle/tdemo_paint.py
==============================================================================
--- python/branches/py3k/Demo/turtle/tdemo_paint.py	(original)
+++ python/branches/py3k/Demo/turtle/tdemo_paint.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 """       turtle-example-suite:
 
             tdemo_paint.py

Modified: python/branches/py3k/Demo/turtle/tdemo_peace.py
==============================================================================
--- python/branches/py3k/Demo/turtle/tdemo_peace.py	(original)
+++ python/branches/py3k/Demo/turtle/tdemo_peace.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 """       turtle-example-suite:
 
               tdemo_peace.py

Modified: python/branches/py3k/Demo/turtle/tdemo_penrose.py
==============================================================================
--- python/branches/py3k/Demo/turtle/tdemo_penrose.py	(original)
+++ python/branches/py3k/Demo/turtle/tdemo_penrose.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 """       xturtle-example-suite:
 
           xtx_kites_and_darts.py

Modified: python/branches/py3k/Demo/turtle/tdemo_planet_and_moon.py
==============================================================================
--- python/branches/py3k/Demo/turtle/tdemo_planet_and_moon.py	(original)
+++ python/branches/py3k/Demo/turtle/tdemo_planet_and_moon.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 """       turtle-example-suite:
 
         tdemo_planets_and_moon.py

Modified: python/branches/py3k/Demo/turtle/tdemo_tree.py
==============================================================================
--- python/branches/py3k/Demo/turtle/tdemo_tree.py	(original)
+++ python/branches/py3k/Demo/turtle/tdemo_tree.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 """      turtle-example-suite:
 
              tdemo_tree.py

Modified: python/branches/py3k/Demo/turtle/tdemo_yinyang.py
==============================================================================
--- python/branches/py3k/Demo/turtle/tdemo_yinyang.py	(original)
+++ python/branches/py3k/Demo/turtle/tdemo_yinyang.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 """       turtle-example-suite:
 
             tdemo_yinyang.py

Modified: python/branches/py3k/Demo/turtle/turtleDemo.py
==============================================================================
--- python/branches/py3k/Demo/turtle/turtleDemo.py	(original)
+++ python/branches/py3k/Demo/turtle/turtleDemo.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 import sys
 import os
 

Modified: python/branches/py3k/Demo/turtle/turtledemo_two_canvases.py
==============================================================================
--- python/branches/py3k/Demo/turtle/turtledemo_two_canvases.py	(original)
+++ python/branches/py3k/Demo/turtle/turtledemo_two_canvases.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 ## DEMONSTRATES USE OF 2 CANVASES, SO CANNOT BE RUN IN DEMOVIEWER!
 """turtle example: Using TurtleScreen and RawTurtle
 for drawing on two distinct canvases.

Modified: python/branches/py3k/Demo/zlib/minigzip.py
==============================================================================
--- python/branches/py3k/Demo/zlib/minigzip.py	(original)
+++ python/branches/py3k/Demo/zlib/minigzip.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Demo program for zlib; it compresses or decompresses files, but *doesn't*
 # delete the original.  This doesn't support all of gzip's options.
 #

Modified: python/branches/py3k/Demo/zlib/zlibdemo.py
==============================================================================
--- python/branches/py3k/Demo/zlib/zlibdemo.py	(original)
+++ python/branches/py3k/Demo/zlib/zlibdemo.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Takes an optional filename, defaulting to this file itself.
 # Reads the file and compresses the content using level 1 and level 9

Modified: python/branches/py3k/Doc/includes/email-alternative.py
==============================================================================
--- python/branches/py3k/Doc/includes/email-alternative.py	(original)
+++ python/branches/py3k/Doc/includes/email-alternative.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/python
+#!/usr/bin/env python3
 
 import smtplib
 

Modified: python/branches/py3k/Doc/includes/email-dir.py
==============================================================================
--- python/branches/py3k/Doc/includes/email-dir.py	(original)
+++ python/branches/py3k/Doc/includes/email-dir.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """Send the contents of a directory as a MIME message."""
 

Modified: python/branches/py3k/Doc/includes/email-unpack.py
==============================================================================
--- python/branches/py3k/Doc/includes/email-unpack.py	(original)
+++ python/branches/py3k/Doc/includes/email-unpack.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """Unpack a MIME message into a directory of files."""
 

Modified: python/branches/py3k/Doc/tools/rstlint.py
==============================================================================
--- python/branches/py3k/Doc/tools/rstlint.py	(original)
+++ python/branches/py3k/Doc/tools/rstlint.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 
 # Check for stylistic and formal issues in .rst and .py

Modified: python/branches/py3k/Lib/base64.py
==============================================================================
--- python/branches/py3k/Lib/base64.py	(original)
+++ python/branches/py3k/Lib/base64.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """RFC 3548: Base16, Base32, Base64 Data Encodings"""
 

Modified: python/branches/py3k/Lib/cProfile.py
==============================================================================
--- python/branches/py3k/Lib/cProfile.py	(original)
+++ python/branches/py3k/Lib/cProfile.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Python interface for the 'lsprof' profiler.
    Compatible with the 'profile' module.

Modified: python/branches/py3k/Lib/difflib.py
==============================================================================
--- python/branches/py3k/Lib/difflib.py	(original)
+++ python/branches/py3k/Lib/difflib.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """
 Module difflib -- helpers for computing deltas between objects.

Modified: python/branches/py3k/Lib/http/cookies.py
==============================================================================
--- python/branches/py3k/Lib/http/cookies.py	(original)
+++ python/branches/py3k/Lib/http/cookies.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 
 ####

Modified: python/branches/py3k/Lib/idlelib/PyShell.py
==============================================================================
--- python/branches/py3k/Lib/idlelib/PyShell.py	(original)
+++ python/branches/py3k/Lib/idlelib/PyShell.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 import os
 import os.path

Modified: python/branches/py3k/Lib/keyword.py
==============================================================================
--- python/branches/py3k/Lib/keyword.py	(original)
+++ python/branches/py3k/Lib/keyword.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Keywords (from "graminit.c")
 

Modified: python/branches/py3k/Lib/lib2to3/pgen2/token.py
==============================================================================
--- python/branches/py3k/Lib/lib2to3/pgen2/token.py	(original)
+++ python/branches/py3k/Lib/lib2to3/pgen2/token.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Token constants (from "token.h")."""
 

Modified: python/branches/py3k/Lib/lib2to3/tests/pytree_idempotency.py
==============================================================================
--- python/branches/py3k/Lib/lib2to3/tests/pytree_idempotency.py	(original)
+++ python/branches/py3k/Lib/lib2to3/tests/pytree_idempotency.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Copyright 2006 Google, Inc. All Rights Reserved.
 # Licensed to PSF under a Contributor Agreement.
 

Modified: python/branches/py3k/Lib/mailbox.py
==============================================================================
--- python/branches/py3k/Lib/mailbox.py	(original)
+++ python/branches/py3k/Lib/mailbox.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Read/write support for Maildir, mbox, MH, Babyl, and MMDF mailboxes."""
 

Modified: python/branches/py3k/Lib/pdb.py
==============================================================================
--- python/branches/py3k/Lib/pdb.py	(original)
+++ python/branches/py3k/Lib/pdb.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """A Python debugger."""
 

Modified: python/branches/py3k/Lib/platform.py
==============================================================================
--- python/branches/py3k/Lib/platform.py	(original)
+++ python/branches/py3k/Lib/platform.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """ This module tries to retrieve as much platform-identifying data as
     possible. It makes this information available via function APIs.

Modified: python/branches/py3k/Lib/profile.py
==============================================================================
--- python/branches/py3k/Lib/profile.py	(original)
+++ python/branches/py3k/Lib/profile.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # Class for profiling python code. rev 1.0  6/2/94
 #

Modified: python/branches/py3k/Lib/pydoc.py
==============================================================================
--- python/branches/py3k/Lib/pydoc.py	(original)
+++ python/branches/py3k/Lib/pydoc.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- coding: latin-1 -*-
 """Generate Python documentation in HTML or text for interactive use.
 

Modified: python/branches/py3k/Lib/quopri.py
==============================================================================
--- python/branches/py3k/Lib/quopri.py	(original)
+++ python/branches/py3k/Lib/quopri.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Conversions to/from quoted-printable transport encoding as per RFC 1521."""
 

Modified: python/branches/py3k/Lib/smtpd.py
==============================================================================
--- python/branches/py3k/Lib/smtpd.py	(original)
+++ python/branches/py3k/Lib/smtpd.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """An RFC 2821 smtp proxy.
 
 Usage: %(program)s [options] [localhost:localport [remotehost:remoteport]]

Modified: python/branches/py3k/Lib/smtplib.py
==============================================================================
--- python/branches/py3k/Lib/smtplib.py	(original)
+++ python/branches/py3k/Lib/smtplib.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 '''SMTP/ESMTP client class.
 

Modified: python/branches/py3k/Lib/symbol.py
==============================================================================
--- python/branches/py3k/Lib/symbol.py	(original)
+++ python/branches/py3k/Lib/symbol.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Non-terminal symbols of Python grammar (from "graminit.h")."""
 

Modified: python/branches/py3k/Lib/tabnanny.py
==============================================================================
--- python/branches/py3k/Lib/tabnanny.py	(original)
+++ python/branches/py3k/Lib/tabnanny.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """The Tab Nanny despises ambiguous indentation.  She knows no mercy.
 

Modified: python/branches/py3k/Lib/tarfile.py
==============================================================================
--- python/branches/py3k/Lib/tarfile.py	(original)
+++ python/branches/py3k/Lib/tarfile.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #-------------------------------------------------------------------
 # tarfile.py
 #-------------------------------------------------------------------

Modified: python/branches/py3k/Lib/test/crashers/recursive_call.py
==============================================================================
--- python/branches/py3k/Lib/test/crashers/recursive_call.py	(original)
+++ python/branches/py3k/Lib/test/crashers/recursive_call.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # No bug report AFAIK, mail on python-dev on 2006-01-10
 

Modified: python/branches/py3k/Lib/test/curses_tests.py
==============================================================================
--- python/branches/py3k/Lib/test/curses_tests.py	(original)
+++ python/branches/py3k/Lib/test/curses_tests.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # $Id: ncurses.py 36559 2004-07-18 05:56:09Z tim_one $
 #

Modified: python/branches/py3k/Lib/test/pystone.py
==============================================================================
--- python/branches/py3k/Lib/test/pystone.py	(original)
+++ python/branches/py3k/Lib/test/pystone.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """
 "PYSTONE" Benchmark Program

Modified: python/branches/py3k/Lib/test/re_tests.py
==============================================================================
--- python/branches/py3k/Lib/test/re_tests.py	(original)
+++ python/branches/py3k/Lib/test/re_tests.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- mode: python -*-
 
 # Re test suite and benchmark suite v1.5

Modified: python/branches/py3k/Lib/test/regrtest.py
==============================================================================
--- python/branches/py3k/Lib/test/regrtest.py	(original)
+++ python/branches/py3k/Lib/test/regrtest.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Regression test.
 

Modified: python/branches/py3k/Lib/test/test___future__.py
==============================================================================
--- python/branches/py3k/Lib/test/test___future__.py	(original)
+++ python/branches/py3k/Lib/test/test___future__.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 import unittest
 from test import support
 import __future__

Modified: python/branches/py3k/Lib/test/test_array.py
==============================================================================
--- python/branches/py3k/Lib/test/test_array.py	(original)
+++ python/branches/py3k/Lib/test/test_array.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Test the arraymodule.
    Roger E. Masse
 """

Modified: python/branches/py3k/Lib/test/test_binhex.py
==============================================================================
--- python/branches/py3k/Lib/test/test_binhex.py	(original)
+++ python/branches/py3k/Lib/test/test_binhex.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Test script for the binhex C module
 
    Uses the mechanism of the python binhex module

Modified: python/branches/py3k/Lib/test/test_bz2.py
==============================================================================
--- python/branches/py3k/Lib/test/test_bz2.py	(original)
+++ python/branches/py3k/Lib/test/test_bz2.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 from test import support
 from test.support import TESTFN
 

Modified: python/branches/py3k/Lib/test/test_cmd.py
==============================================================================
--- python/branches/py3k/Lib/test/test_cmd.py	(original)
+++ python/branches/py3k/Lib/test/test_cmd.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Test script for the 'cmd' module
 Original by Michael Schneider

Modified: python/branches/py3k/Lib/test/test_codecencodings_cn.py
==============================================================================
--- python/branches/py3k/Lib/test/test_codecencodings_cn.py	(original)
+++ python/branches/py3k/Lib/test/test_codecencodings_cn.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # test_codecencodings_cn.py
 #   Codec encoding tests for PRC encodings.

Modified: python/branches/py3k/Lib/test/test_codecencodings_hk.py
==============================================================================
--- python/branches/py3k/Lib/test/test_codecencodings_hk.py	(original)
+++ python/branches/py3k/Lib/test/test_codecencodings_hk.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # test_codecencodings_hk.py
 #   Codec encoding tests for HongKong encodings.

Modified: python/branches/py3k/Lib/test/test_codecencodings_jp.py
==============================================================================
--- python/branches/py3k/Lib/test/test_codecencodings_jp.py	(original)
+++ python/branches/py3k/Lib/test/test_codecencodings_jp.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # test_codecencodings_jp.py
 #   Codec encoding tests for Japanese encodings.

Modified: python/branches/py3k/Lib/test/test_codecencodings_kr.py
==============================================================================
--- python/branches/py3k/Lib/test/test_codecencodings_kr.py	(original)
+++ python/branches/py3k/Lib/test/test_codecencodings_kr.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # test_codecencodings_kr.py
 #   Codec encoding tests for ROK encodings.

Modified: python/branches/py3k/Lib/test/test_codecencodings_tw.py
==============================================================================
--- python/branches/py3k/Lib/test/test_codecencodings_tw.py	(original)
+++ python/branches/py3k/Lib/test/test_codecencodings_tw.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # test_codecencodings_tw.py
 #   Codec encoding tests for ROC encodings.

Modified: python/branches/py3k/Lib/test/test_codecmaps_cn.py
==============================================================================
--- python/branches/py3k/Lib/test/test_codecmaps_cn.py	(original)
+++ python/branches/py3k/Lib/test/test_codecmaps_cn.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # test_codecmaps_cn.py
 #   Codec mapping tests for PRC encodings

Modified: python/branches/py3k/Lib/test/test_codecmaps_hk.py
==============================================================================
--- python/branches/py3k/Lib/test/test_codecmaps_hk.py	(original)
+++ python/branches/py3k/Lib/test/test_codecmaps_hk.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # test_codecmaps_hk.py
 #   Codec mapping tests for HongKong encodings

Modified: python/branches/py3k/Lib/test/test_codecmaps_jp.py
==============================================================================
--- python/branches/py3k/Lib/test/test_codecmaps_jp.py	(original)
+++ python/branches/py3k/Lib/test/test_codecmaps_jp.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # test_codecmaps_jp.py
 #   Codec mapping tests for Japanese encodings

Modified: python/branches/py3k/Lib/test/test_codecmaps_kr.py
==============================================================================
--- python/branches/py3k/Lib/test/test_codecmaps_kr.py	(original)
+++ python/branches/py3k/Lib/test/test_codecmaps_kr.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # test_codecmaps_kr.py
 #   Codec mapping tests for ROK encodings

Modified: python/branches/py3k/Lib/test/test_codecmaps_tw.py
==============================================================================
--- python/branches/py3k/Lib/test/test_codecmaps_tw.py	(original)
+++ python/branches/py3k/Lib/test/test_codecmaps_tw.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # test_codecmaps_tw.py
 #   Codec mapping tests for ROC encodings

Modified: python/branches/py3k/Lib/test/test_dbm.py
==============================================================================
--- python/branches/py3k/Lib/test/test_dbm.py	(original)
+++ python/branches/py3k/Lib/test/test_dbm.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Test script for the dbm.open function based on testdumbdbm.py"""
 
 import os

Modified: python/branches/py3k/Lib/test/test_dbm_dumb.py
==============================================================================
--- python/branches/py3k/Lib/test/test_dbm_dumb.py	(original)
+++ python/branches/py3k/Lib/test/test_dbm_dumb.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Test script for the dumbdbm module
    Original by Roger E. Masse
 """

Modified: python/branches/py3k/Lib/test/test_eof.py
==============================================================================
--- python/branches/py3k/Lib/test/test_eof.py	(original)
+++ python/branches/py3k/Lib/test/test_eof.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """test script for a few new invalid token catches"""
 
 import unittest

Modified: python/branches/py3k/Lib/test/test_errno.py
==============================================================================
--- python/branches/py3k/Lib/test/test_errno.py	(original)
+++ python/branches/py3k/Lib/test/test_errno.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Test the errno module
    Roger E. Masse
 """

Modified: python/branches/py3k/Lib/test/test_gzip.py
==============================================================================
--- python/branches/py3k/Lib/test/test_gzip.py	(original)
+++ python/branches/py3k/Lib/test/test_gzip.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Test script for the gzip module.
 """
 

Modified: python/branches/py3k/Lib/test/test_keywordonlyarg.py
==============================================================================
--- python/branches/py3k/Lib/test/test_keywordonlyarg.py	(original)
+++ python/branches/py3k/Lib/test/test_keywordonlyarg.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """Unit tests for the keyword only argument specified in PEP 3102."""
 

Modified: python/branches/py3k/Lib/test/test_logging.py
==============================================================================
--- python/branches/py3k/Lib/test/test_logging.py	(original)
+++ python/branches/py3k/Lib/test/test_logging.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # Copyright 2001-2010 by Vinay Sajip. All Rights Reserved.
 #

Modified: python/branches/py3k/Lib/test/test_marshal.py
==============================================================================
--- python/branches/py3k/Lib/test/test_marshal.py	(original)
+++ python/branches/py3k/Lib/test/test_marshal.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from test import support
 import marshal

Modified: python/branches/py3k/Lib/test/test_multibytecodec.py
==============================================================================
--- python/branches/py3k/Lib/test/test_multibytecodec.py	(original)
+++ python/branches/py3k/Lib/test/test_multibytecodec.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # test_multibytecodec.py
 #   Unit test for multibytecodec itself

Modified: python/branches/py3k/Lib/test/test_multibytecodec_support.py
==============================================================================
--- python/branches/py3k/Lib/test/test_multibytecodec_support.py	(original)
+++ python/branches/py3k/Lib/test/test_multibytecodec_support.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # test_multibytecodec_support.py
 #   Common Unittest Routines for CJK codecs

Modified: python/branches/py3k/Lib/test/test_multiprocessing.py
==============================================================================
--- python/branches/py3k/Lib/test/test_multiprocessing.py	(original)
+++ python/branches/py3k/Lib/test/test_multiprocessing.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 #
 # Unit tests for the multiprocessing package

Modified: python/branches/py3k/Lib/test/test_popen.py
==============================================================================
--- python/branches/py3k/Lib/test/test_popen.py	(original)
+++ python/branches/py3k/Lib/test/test_popen.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Basic tests for os.popen()
 
   Particularly useful for platforms that fake popen.

Modified: python/branches/py3k/Lib/test/test_random.py
==============================================================================
--- python/branches/py3k/Lib/test/test_random.py	(original)
+++ python/branches/py3k/Lib/test/test_random.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import random

Modified: python/branches/py3k/Lib/test/test_smtpnet.py
==============================================================================
--- python/branches/py3k/Lib/test/test_smtpnet.py	(original)
+++ python/branches/py3k/Lib/test/test_smtpnet.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 from test import support

Modified: python/branches/py3k/Lib/test/test_socket.py
==============================================================================
--- python/branches/py3k/Lib/test/test_socket.py	(original)
+++ python/branches/py3k/Lib/test/test_socket.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 from test import support

Modified: python/branches/py3k/Lib/test/test_tcl.py
==============================================================================
--- python/branches/py3k/Lib/test/test_tcl.py	(original)
+++ python/branches/py3k/Lib/test/test_tcl.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 import os

Modified: python/branches/py3k/Lib/test/test_urllib2_localnet.py
==============================================================================
--- python/branches/py3k/Lib/test/test_urllib2_localnet.py	(original)
+++ python/branches/py3k/Lib/test/test_urllib2_localnet.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import email
 import threading

Modified: python/branches/py3k/Lib/test/test_urllib2net.py
==============================================================================
--- python/branches/py3k/Lib/test/test_urllib2net.py	(original)
+++ python/branches/py3k/Lib/test/test_urllib2net.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 from test import support

Modified: python/branches/py3k/Lib/test/test_urllibnet.py
==============================================================================
--- python/branches/py3k/Lib/test/test_urllibnet.py	(original)
+++ python/branches/py3k/Lib/test/test_urllibnet.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import unittest
 from test import support

Modified: python/branches/py3k/Lib/test/test_urlparse.py
==============================================================================
--- python/branches/py3k/Lib/test/test_urlparse.py	(original)
+++ python/branches/py3k/Lib/test/test_urlparse.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 from test import support
 import unittest

Modified: python/branches/py3k/Lib/test/test_userstring.py
==============================================================================
--- python/branches/py3k/Lib/test/test_userstring.py	(original)
+++ python/branches/py3k/Lib/test/test_userstring.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # UserString is a wrapper around the native builtin string type.
 # UserString instances should behave similar to builtin string objects.
 

Modified: python/branches/py3k/Lib/test/test_with.py
==============================================================================
--- python/branches/py3k/Lib/test/test_with.py	(original)
+++ python/branches/py3k/Lib/test/test_with.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """Unit tests for the with statement specified in PEP 343."""
 

Modified: python/branches/py3k/Lib/test/test_xmlrpc_net.py
==============================================================================
--- python/branches/py3k/Lib/test/test_xmlrpc_net.py	(original)
+++ python/branches/py3k/Lib/test/test_xmlrpc_net.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import collections
 import errno

Modified: python/branches/py3k/Lib/timeit.py
==============================================================================
--- python/branches/py3k/Lib/timeit.py	(original)
+++ python/branches/py3k/Lib/timeit.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Tool for measuring execution time of small code snippets.
 

Modified: python/branches/py3k/Lib/token.py
==============================================================================
--- python/branches/py3k/Lib/token.py	(original)
+++ python/branches/py3k/Lib/token.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Token constants (from "token.h")."""
 

Modified: python/branches/py3k/Lib/trace.py
==============================================================================
--- python/branches/py3k/Lib/trace.py	(original)
+++ python/branches/py3k/Lib/trace.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # portions copyright 2001, Autonomous Zones Industries, Inc., all rights...
 # err...  reserved and offered to the public under the terms of the

Modified: python/branches/py3k/Lib/uu.py
==============================================================================
--- python/branches/py3k/Lib/uu.py	(original)
+++ python/branches/py3k/Lib/uu.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Copyright 1994 by Lance Ellinghouse
 # Cathedral City, California Republic, United States of America.

Modified: python/branches/py3k/Lib/webbrowser.py
==============================================================================
--- python/branches/py3k/Lib/webbrowser.py	(original)
+++ python/branches/py3k/Lib/webbrowser.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Interfaces for launching and remotely controlling Web browsers."""
 # Maintained by Georg Brandl.
 

Modified: python/branches/py3k/Python/makeopcodetargets.py
==============================================================================
--- python/branches/py3k/Python/makeopcodetargets.py	(original)
+++ python/branches/py3k/Python/makeopcodetargets.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Generate C code for the jump table of the threaded code interpreter
 (for compilers supporting computed gotos or "labels-as-values", such as gcc).
 """

Modified: python/branches/py3k/Tools/faqwiz/faqw.py
==============================================================================
--- python/branches/py3k/Tools/faqwiz/faqw.py	(original)
+++ python/branches/py3k/Tools/faqwiz/faqw.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/local/bin/python
+#!/usr/bin/env python3
 
 """FAQ wizard bootstrap."""
 

Modified: python/branches/py3k/Tools/freeze/freeze.py
==============================================================================
--- python/branches/py3k/Tools/freeze/freeze.py	(original)
+++ python/branches/py3k/Tools/freeze/freeze.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Freeze a Python script into a binary.
 

Modified: python/branches/py3k/Tools/i18n/makelocalealias.py
==============================================================================
--- python/branches/py3k/Tools/i18n/makelocalealias.py	(original)
+++ python/branches/py3k/Tools/i18n/makelocalealias.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
     Convert the X11 locale.alias file into a mapping dictionary suitable
     for locale.py.

Modified: python/branches/py3k/Tools/i18n/msgfmt.py
==============================================================================
--- python/branches/py3k/Tools/i18n/msgfmt.py	(original)
+++ python/branches/py3k/Tools/i18n/msgfmt.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 # -*- coding: iso-8859-1 -*-
 # Written by Martin v. Löwis <loewis at informatik.hu-berlin.de>
 

Modified: python/branches/py3k/Tools/i18n/pygettext.py
==============================================================================
--- python/branches/py3k/Tools/i18n/pygettext.py	(original)
+++ python/branches/py3k/Tools/i18n/pygettext.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 # -*- coding: iso-8859-1 -*-
 # Originally written by Barry Warsaw <barry at zope.com>
 #

Modified: python/branches/py3k/Tools/modulator/Tkextra.py
==============================================================================
--- python/branches/py3k/Tools/modulator/Tkextra.py	(original)
+++ python/branches/py3k/Tools/modulator/Tkextra.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # A Python function that generates dialog boxes with a text message,
 # optional bitmap, and any number of buttons.

Modified: python/branches/py3k/Tools/modulator/modulator.py
==============================================================================
--- python/branches/py3k/Tools/modulator/modulator.py	(original)
+++ python/branches/py3k/Tools/modulator/modulator.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 #
 # Modulator - Generate skeleton modules.
 #

Modified: python/branches/py3k/Tools/scripts/byteyears.py
==============================================================================
--- python/branches/py3k/Tools/scripts/byteyears.py	(original)
+++ python/branches/py3k/Tools/scripts/byteyears.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Print the product of age and size of each file, in suitable units.
 #

Modified: python/branches/py3k/Tools/scripts/checkappend.py
==============================================================================
--- python/branches/py3k/Tools/scripts/checkappend.py	(original)
+++ python/branches/py3k/Tools/scripts/checkappend.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Released to the public domain, by Tim Peters, 28 February 2000.
 

Modified: python/branches/py3k/Tools/scripts/checkpyc.py
==============================================================================
--- python/branches/py3k/Tools/scripts/checkpyc.py	(original)
+++ python/branches/py3k/Tools/scripts/checkpyc.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 # Check that all ".pyc" files exist and are up-to-date
 # Uses module 'os'
 

Modified: python/branches/py3k/Tools/scripts/classfix.py
==============================================================================
--- python/branches/py3k/Tools/scripts/classfix.py	(original)
+++ python/branches/py3k/Tools/scripts/classfix.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # This script is obsolete -- it is kept for historical purposes only.
 #

Modified: python/branches/py3k/Tools/scripts/cleanfuture.py
==============================================================================
--- python/branches/py3k/Tools/scripts/cleanfuture.py	(original)
+++ python/branches/py3k/Tools/scripts/cleanfuture.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """cleanfuture [-d][-r][-v] path ...
 

Modified: python/branches/py3k/Tools/scripts/combinerefs.py
==============================================================================
--- python/branches/py3k/Tools/scripts/combinerefs.py	(original)
+++ python/branches/py3k/Tools/scripts/combinerefs.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """
 combinerefs path

Modified: python/branches/py3k/Tools/scripts/copytime.py
==============================================================================
--- python/branches/py3k/Tools/scripts/copytime.py	(original)
+++ python/branches/py3k/Tools/scripts/copytime.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Copy one file's atime and mtime to another
 

Modified: python/branches/py3k/Tools/scripts/crlf.py
==============================================================================
--- python/branches/py3k/Tools/scripts/crlf.py	(original)
+++ python/branches/py3k/Tools/scripts/crlf.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 "Replace CRLF with LF in argument files.  Print names of changed files."
 
 import sys, os

Modified: python/branches/py3k/Tools/scripts/cvsfiles.py
==============================================================================
--- python/branches/py3k/Tools/scripts/cvsfiles.py	(original)
+++ python/branches/py3k/Tools/scripts/cvsfiles.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Print a list of files that are mentioned in CVS directories.
 

Modified: python/branches/py3k/Tools/scripts/db2pickle.py
==============================================================================
--- python/branches/py3k/Tools/scripts/db2pickle.py	(original)
+++ python/branches/py3k/Tools/scripts/db2pickle.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 Synopsis: %(prog)s [-h|-g|-b|-r|-a] dbfile [ picklefile ]

Modified: python/branches/py3k/Tools/scripts/dutree.py
==============================================================================
--- python/branches/py3k/Tools/scripts/dutree.py	(original)
+++ python/branches/py3k/Tools/scripts/dutree.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 # Format du output in a tree shape
 
 import os, sys, errno

Modified: python/branches/py3k/Tools/scripts/eptags.py
==============================================================================
--- python/branches/py3k/Tools/scripts/eptags.py	(original)
+++ python/branches/py3k/Tools/scripts/eptags.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Create a TAGS file for Python programs, usable with GNU Emacs.
 
 usage: eptags pyfiles...

Modified: python/branches/py3k/Tools/scripts/find_recursionlimit.py
==============================================================================
--- python/branches/py3k/Tools/scripts/find_recursionlimit.py	(original)
+++ python/branches/py3k/Tools/scripts/find_recursionlimit.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """Find the maximum recursion limit that prevents interpreter termination.
 
 This script finds the maximum safe recursion limit on a particular

Modified: python/branches/py3k/Tools/scripts/finddiv.py
==============================================================================
--- python/branches/py3k/Tools/scripts/finddiv.py	(original)
+++ python/branches/py3k/Tools/scripts/finddiv.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """finddiv - a grep-like tool that looks for division operators.
 

Modified: python/branches/py3k/Tools/scripts/findlinksto.py
==============================================================================
--- python/branches/py3k/Tools/scripts/findlinksto.py	(original)
+++ python/branches/py3k/Tools/scripts/findlinksto.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # findlinksto
 #

Modified: python/branches/py3k/Tools/scripts/findnocoding.py
==============================================================================
--- python/branches/py3k/Tools/scripts/findnocoding.py	(original)
+++ python/branches/py3k/Tools/scripts/findnocoding.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """List all those Python files that require a coding directive
 

Modified: python/branches/py3k/Tools/scripts/fixcid.py
==============================================================================
--- python/branches/py3k/Tools/scripts/fixcid.py	(original)
+++ python/branches/py3k/Tools/scripts/fixcid.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Perform massive identifier substitution on C source files.
 # This actually tokenizes the files (to some extent) so it can

Modified: python/branches/py3k/Tools/scripts/fixdiv.py
==============================================================================
--- python/branches/py3k/Tools/scripts/fixdiv.py	(original)
+++ python/branches/py3k/Tools/scripts/fixdiv.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """fixdiv - tool to fix division operators.
 

Modified: python/branches/py3k/Tools/scripts/fixheader.py
==============================================================================
--- python/branches/py3k/Tools/scripts/fixheader.py	(original)
+++ python/branches/py3k/Tools/scripts/fixheader.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Add some standard cpp magic to a header file
 

Modified: python/branches/py3k/Tools/scripts/fixnotice.py
==============================================================================
--- python/branches/py3k/Tools/scripts/fixnotice.py	(original)
+++ python/branches/py3k/Tools/scripts/fixnotice.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """(Ostensibly) fix copyright notices in files.
 

Modified: python/branches/py3k/Tools/scripts/fixps.py
==============================================================================
--- python/branches/py3k/Tools/scripts/fixps.py	(original)
+++ python/branches/py3k/Tools/scripts/fixps.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Fix Python script(s) to reference the interpreter via /usr/bin/env python.
 # Warning: this overwrites the file without making a backup.

Modified: python/branches/py3k/Tools/scripts/ftpmirror.py
==============================================================================
--- python/branches/py3k/Tools/scripts/ftpmirror.py	(original)
+++ python/branches/py3k/Tools/scripts/ftpmirror.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Mirror a remote ftp subtree into a local directory tree.
 

Modified: python/branches/py3k/Tools/scripts/google.py
==============================================================================
--- python/branches/py3k/Tools/scripts/google.py	(original)
+++ python/branches/py3k/Tools/scripts/google.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 import sys, webbrowser
 

Modified: python/branches/py3k/Tools/scripts/gprof2html.py
==============================================================================
--- python/branches/py3k/Tools/scripts/gprof2html.py	(original)
+++ python/branches/py3k/Tools/scripts/gprof2html.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python2.3
+#! /usr/bin/env python32.3
 
 """Transform gprof(1) output into useful HTML."""
 

Modified: python/branches/py3k/Tools/scripts/h2py.py
==============================================================================
--- python/branches/py3k/Tools/scripts/h2py.py	(original)
+++ python/branches/py3k/Tools/scripts/h2py.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Read #define's and translate to Python code.
 # Handle #include statements.

Modified: python/branches/py3k/Tools/scripts/ifdef.py
==============================================================================
--- python/branches/py3k/Tools/scripts/ifdef.py	(original)
+++ python/branches/py3k/Tools/scripts/ifdef.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Selectively preprocess #ifdef / #ifndef statements.
 # Usage:

Modified: python/branches/py3k/Tools/scripts/lfcr.py
==============================================================================
--- python/branches/py3k/Tools/scripts/lfcr.py	(original)
+++ python/branches/py3k/Tools/scripts/lfcr.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 "Replace LF with CRLF in argument files.  Print names of changed files."
 

Modified: python/branches/py3k/Tools/scripts/linktree.py
==============================================================================
--- python/branches/py3k/Tools/scripts/linktree.py	(original)
+++ python/branches/py3k/Tools/scripts/linktree.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # linktree
 #

Modified: python/branches/py3k/Tools/scripts/lll.py
==============================================================================
--- python/branches/py3k/Tools/scripts/lll.py	(original)
+++ python/branches/py3k/Tools/scripts/lll.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Find symbolic links and show where they point to.
 # Arguments are directories to search; default is current directory.

Modified: python/branches/py3k/Tools/scripts/logmerge.py
==============================================================================
--- python/branches/py3k/Tools/scripts/logmerge.py	(original)
+++ python/branches/py3k/Tools/scripts/logmerge.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Consolidate a bunch of CVS or RCS logs read from stdin.
 

Modified: python/branches/py3k/Tools/scripts/md5sum.py
==============================================================================
--- python/branches/py3k/Tools/scripts/md5sum.py	(original)
+++ python/branches/py3k/Tools/scripts/md5sum.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Python utility to print MD5 checksums of argument files.
 """

Modified: python/branches/py3k/Tools/scripts/methfix.py
==============================================================================
--- python/branches/py3k/Tools/scripts/methfix.py	(original)
+++ python/branches/py3k/Tools/scripts/methfix.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Fix Python source files to avoid using
 #       def method(self, (arg1, ..., argn)):

Modified: python/branches/py3k/Tools/scripts/mkreal.py
==============================================================================
--- python/branches/py3k/Tools/scripts/mkreal.py	(original)
+++ python/branches/py3k/Tools/scripts/mkreal.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # mkreal
 #

Modified: python/branches/py3k/Tools/scripts/ndiff.py
==============================================================================
--- python/branches/py3k/Tools/scripts/ndiff.py	(original)
+++ python/branches/py3k/Tools/scripts/ndiff.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Module ndiff version 1.7.0
 # Released to the public domain 08-Dec-2000,

Modified: python/branches/py3k/Tools/scripts/nm2def.py
==============================================================================
--- python/branches/py3k/Tools/scripts/nm2def.py	(original)
+++ python/branches/py3k/Tools/scripts/nm2def.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 """nm2def.py
 
 Helpers to extract symbols from Unix libs and auto-generate

Modified: python/branches/py3k/Tools/scripts/objgraph.py
==============================================================================
--- python/branches/py3k/Tools/scripts/objgraph.py	(original)
+++ python/branches/py3k/Tools/scripts/objgraph.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # objgraph
 #

Modified: python/branches/py3k/Tools/scripts/parseentities.py
==============================================================================
--- python/branches/py3k/Tools/scripts/parseentities.py	(original)
+++ python/branches/py3k/Tools/scripts/parseentities.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/local/bin/python
+#!/usr/bin/env python3
 """ Utility for parsing HTML entity definitions available from:
 
       http://www.w3.org/ as e.g.

Modified: python/branches/py3k/Tools/scripts/pdeps.py
==============================================================================
--- python/branches/py3k/Tools/scripts/pdeps.py	(original)
+++ python/branches/py3k/Tools/scripts/pdeps.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # pdeps
 #

Modified: python/branches/py3k/Tools/scripts/pickle2db.py
==============================================================================
--- python/branches/py3k/Tools/scripts/pickle2db.py	(original)
+++ python/branches/py3k/Tools/scripts/pickle2db.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """
 Synopsis: %(prog)s [-h|-b|-g|-r|-a|-d] [ picklefile ] dbfile

Modified: python/branches/py3k/Tools/scripts/pindent.py
==============================================================================
--- python/branches/py3k/Tools/scripts/pindent.py	(original)
+++ python/branches/py3k/Tools/scripts/pindent.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # This file contains a class and a main program that perform three
 # related (though complimentary) formatting operations on Python

Modified: python/branches/py3k/Tools/scripts/ptags.py
==============================================================================
--- python/branches/py3k/Tools/scripts/ptags.py	(original)
+++ python/branches/py3k/Tools/scripts/ptags.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # ptags
 #

Modified: python/branches/py3k/Tools/scripts/pysource.py
==============================================================================
--- python/branches/py3k/Tools/scripts/pysource.py	(original)
+++ python/branches/py3k/Tools/scripts/pysource.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """\
 List python source files.

Modified: python/branches/py3k/Tools/scripts/reindent-rst.py
==============================================================================
--- python/branches/py3k/Tools/scripts/reindent-rst.py	(original)
+++ python/branches/py3k/Tools/scripts/reindent-rst.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # Make a reST file compliant to our pre-commit hook.
 # Currently just remove trailing whitespace.

Modified: python/branches/py3k/Tools/scripts/reindent.py
==============================================================================
--- python/branches/py3k/Tools/scripts/reindent.py	(original)
+++ python/branches/py3k/Tools/scripts/reindent.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Released to the public domain, by Tim Peters, 03 October 2000.
 

Modified: python/branches/py3k/Tools/scripts/rgrep.py
==============================================================================
--- python/branches/py3k/Tools/scripts/rgrep.py	(original)
+++ python/branches/py3k/Tools/scripts/rgrep.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Reverse grep.
 

Modified: python/branches/py3k/Tools/scripts/serve.py
==============================================================================
--- python/branches/py3k/Tools/scripts/serve.py	(original)
+++ python/branches/py3k/Tools/scripts/serve.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 '''
 Small wsgiref based web server. Takes a path to serve from and an
 optional port number (defaults to 8000), then tries to serve files.

Modified: python/branches/py3k/Tools/scripts/suff.py
==============================================================================
--- python/branches/py3k/Tools/scripts/suff.py	(original)
+++ python/branches/py3k/Tools/scripts/suff.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # suff
 #

Modified: python/branches/py3k/Tools/scripts/svneol.py
==============================================================================
--- python/branches/py3k/Tools/scripts/svneol.py	(original)
+++ python/branches/py3k/Tools/scripts/svneol.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """
 SVN helper script.

Modified: python/branches/py3k/Tools/scripts/texi2html.py
==============================================================================
--- python/branches/py3k/Tools/scripts/texi2html.py	(original)
+++ python/branches/py3k/Tools/scripts/texi2html.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Convert GNU texinfo files into HTML, one file per node.
 # Based on Texinfo 2.14.

Modified: python/branches/py3k/Tools/scripts/treesync.py
==============================================================================
--- python/branches/py3k/Tools/scripts/treesync.py	(original)
+++ python/branches/py3k/Tools/scripts/treesync.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Script to synchronize two source trees.
 

Modified: python/branches/py3k/Tools/scripts/untabify.py
==============================================================================
--- python/branches/py3k/Tools/scripts/untabify.py	(original)
+++ python/branches/py3k/Tools/scripts/untabify.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 "Replace tabs with spaces in argument files.  Print names of changed files."
 

Modified: python/branches/py3k/Tools/scripts/which.py
==============================================================================
--- python/branches/py3k/Tools/scripts/which.py	(original)
+++ python/branches/py3k/Tools/scripts/which.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Variant of "which".
 # On stderr, near and total misses are reported.

Modified: python/branches/py3k/Tools/scripts/xxci.py
==============================================================================
--- python/branches/py3k/Tools/scripts/xxci.py	(original)
+++ python/branches/py3k/Tools/scripts/xxci.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # xxci
 #

Modified: python/branches/py3k/Tools/ssl/get-remote-certificate.py
==============================================================================
--- python/branches/py3k/Tools/ssl/get-remote-certificate.py	(original)
+++ python/branches/py3k/Tools/ssl/get-remote-certificate.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # fetch the certificate that the server(s) are providing in PEM form
 #

Modified: python/branches/py3k/Tools/unicode/comparecodecs.py
==============================================================================
--- python/branches/py3k/Tools/unicode/comparecodecs.py	(original)
+++ python/branches/py3k/Tools/unicode/comparecodecs.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """ Compare the output of two codecs.
 

Modified: python/branches/py3k/Tools/webchecker/wcgui.py
==============================================================================
--- python/branches/py3k/Tools/webchecker/wcgui.py	(original)
+++ python/branches/py3k/Tools/webchecker/wcgui.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """GUI interface to webchecker.
 

Modified: python/branches/py3k/Tools/webchecker/webchecker.py
==============================================================================
--- python/branches/py3k/Tools/webchecker/webchecker.py	(original)
+++ python/branches/py3k/Tools/webchecker/webchecker.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 # Original code by Guido van Rossum; extensive changes by Sam Bayer,
 # including code to check URL fragments.

Modified: python/branches/py3k/Tools/webchecker/websucker.py
==============================================================================
--- python/branches/py3k/Tools/webchecker/websucker.py	(original)
+++ python/branches/py3k/Tools/webchecker/websucker.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """A variant on webchecker that creates a mirror copy of a remote site."""
 

Modified: python/branches/py3k/Tools/webchecker/wsgui.py
==============================================================================
--- python/branches/py3k/Tools/webchecker/wsgui.py	(original)
+++ python/branches/py3k/Tools/webchecker/wsgui.py	Thu Mar 11 23:53:45 2010
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/env python3
 
 """Tkinter-based GUI for websucker.
 
