1 files changed, 14 insertions, 17 deletions
diff --git a/Tools/scripts/untabify.py b/Tools/scripts/untabify.py
index 861c83c..83e73da 100755
--- a/Tools/scripts/untabify.py
+++ b/Tools/scripts/untabify.py
@@ -1,21 +1,20 @@
-#! /usr/bin/env python3
+#! /usr/bin/env python
 
 "Replace tabs with spaces in argument files.  Print names of changed files."
 
 import os
 import sys
 import getopt
-import tokenize
 
 def main():
     tabsize = 8
     try:
         opts, args = getopt.getopt(sys.argv[1:], "t:")
         if not args:
-            raise getopt.error("At least one file argument required")
-    except getopt.error as msg:
-        print(msg)
-        print("usage:", sys.argv[0], "[-t tabwidth] file ...")
+            raise getopt.error, "At least one file argument required"
+    except getopt.error, msg:
+        print msg
+        print "usage:", sys.argv[0], "[-t tabwidth] file ..."
         return
     for optname, optvalue in opts:
         if optname == '-t':
@@ -24,14 +23,13 @@ def main():
     for filename in args:
         process(filename, tabsize)
 
-
 def process(filename, tabsize, verbose=True):
     try:
-        with tokenize.open(filename) as f:
-            text = f.read()
-            encoding = f.encoding
-    except IOError as msg:
-        print("%r: I/O error: %s" % (filename, msg))
+        f = open(filename)
+        text = f.read()
+        f.close()
+    except IOError, msg:
+        print "%r: I/O error: %s" % (filename, msg)
         return
     newtext = text.expandtabs(tabsize)
     if newtext == text:
@@ -39,17 +37,16 @@ def process(filename, tabsize, verbose=True):
     backup = filename + "~"
     try:
         os.unlink(backup)
-    except OSError:
+    except os.error:
         pass
     try:
         os.rename(filename, backup)
-    except OSError:
+    except os.error:
         pass
-    with open(filename, "w", encoding=encoding) as f:
+    with open(filename, "w") as f:
         f.write(newtext)
     if verbose:
-        print(filename)
-
+        print filename
 
 if __name__ == '__main__':
     main()