[Python-checkins] r75063 - in python/branches/release31-maint: Lib/lib2to3/main.py Tools/scripts/pathfix.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri Sep 25 23:13:17 2009
New Revision: 75063

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

........
  r75061 | benjamin.peterson | 2009-09-25 15:34:04 -0500 (Fri, 25 Sep 2009) | 1 line
  
  fix print statement
........
  r75062 | benjamin.peterson | 2009-09-25 15:56:52 -0500 (Fri, 25 Sep 2009) | 2 lines
  
  correct the fixpath.py script to work in Python 3 #6999
........


Modified:
   python/branches/release31-maint/   (props changed)
   python/branches/release31-maint/Lib/lib2to3/main.py
   python/branches/release31-maint/Tools/scripts/pathfix.py

Modified: python/branches/release31-maint/Lib/lib2to3/main.py
==============================================================================
--- python/branches/release31-maint/Lib/lib2to3/main.py	(original)
+++ python/branches/release31-maint/Lib/lib2to3/main.py	Fri Sep 25 23:13:17 2009
@@ -64,7 +64,7 @@
                     print(line)
 
 def warn(msg):
-    print >> sys.stderr, "WARNING: %s" % (msg,)
+    print("WARNING: %s" % (msg,), file=sys.stderr)
 
 
 def main(fixer_pkg, args=None):
@@ -159,8 +159,8 @@
                             options.processes)
             except refactor.MultiprocessingUnsupported:
                 assert options.processes > 1
-                print >> sys.stderr, "Sorry, -j isn't " \
-                    "supported on this platform."
+                print("Sorry, -j isn't supported on this platform.",
+                      file=sys.stderr)
                 return 1
         rt.summarize()
 

Modified: python/branches/release31-maint/Tools/scripts/pathfix.py
==============================================================================
--- python/branches/release31-maint/Tools/scripts/pathfix.py	(original)
+++ python/branches/release31-maint/Tools/scripts/pathfix.py	Fri Sep 25 23:13:17 2009
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#!/usr/bin/env python3
 
 # Change the #! line occurring in Python scripts.  The new interpreter
 # pathname must be given with a -i option.
@@ -43,8 +43,9 @@
         sys.exit(2)
     for o, a in opts:
         if o == '-i':
-            new_interpreter = a
-    if not new_interpreter or new_interpreter[0] != '/' or not args:
+            new_interpreter = a.encode()
+    if not new_interpreter or not new_interpreter.startswith(b'/') or \
+           not args:
         err('-i option or file-or-directory missing\n')
         err(usage)
         sys.exit(2)
@@ -61,7 +62,7 @@
 
 ispythonprog = re.compile('^[a-zA-Z0-9_]+\.py$')
 def ispython(name):
-    return ispythonprog.match(name) >= 0
+    return bool(ispythonprog.match(name))
 
 def recursedown(dirname):
     dbg('recursedown(%r)\n' % (dirname,))
@@ -88,7 +89,7 @@
 def fix(filename):
 ##  dbg('fix(%r)\n' % (filename,))
     try:
-        f = open(filename, 'r')
+        f = open(filename, 'rb')
     except IOError as msg:
         err('%s: cannot open: %r\n' % (filename, msg))
         return 1
@@ -101,7 +102,7 @@
     head, tail = os.path.split(filename)
     tempname = os.path.join(head, '@' + tail)
     try:
-        g = open(tempname, 'w')
+        g = open(tempname, 'wb')
     except IOError as msg:
         f.close()
         err('%s: cannot create: %r\n' % (tempname, msg))
@@ -139,11 +140,11 @@
     return 0
 
 def fixline(line):
-    if not line.startswith('#!'):
+    if not line.startswith(b'#!'):
         return line
-    if "python" not in line:
+    if b"python" not in line:
         return line
-    return '#! %s\n' % new_interpreter
+    return b'#! ' + new_interpreter + b'\n'
 
 if __name__ == '__main__':
     main()