Merge branch tmwa:master into masterHEADmaster

1 files changed, 3 insertions, 4 deletions

diff --git a/tools/indenter b/tools/indenter
index 0d93543..ee000da 100755
--- a/tools/indenter
+++ b/tools/indenter
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # -*- encoding: utf-8
 ##    indenter.py - Top-level indenter for all files
 ##
@@ -20,10 +20,9 @@
 ##    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
-from __future__ import print_function
 
 from collections import namedtuple
-import cStringIO
+import io
 import string
 import subprocess
 import sys
@@ -114,7 +113,7 @@ class Reader(object):
             self._column += 1
 
 def string_reader(s, name='<string>', line=1, column=1):
-    return Reader(name, cStringIO.StringIO(s), line, column)
+    return Reader(name, io.StringIO(s), line, column)
 
 def take_while(b, r, s):
     assert isinstance(b, bytearray)