commit 3889897a1f040f4da006ea4248c36a3b6c132b96
author David Brazdil <dbrazdil@google.com> Tue Jan 20 10:02:04 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 20 10:02:05 2015 +0000
tree a3d971762ee1cf1de81111f874ae58c5cfe38603
parent a943a75a890f43ff9517e13bb6c16de8bfa35d90
parent 123c5e983d26b6fb57d2ebe817e5c20fb6046803

Merge "ART: Run Checker with Python >2.6"

tools/checker.py

diff --git a/tools/checker.py b/tools/checker.py
index b71eac6..55f015e 100755
--- a/tools/checker.py
+++ b/tools/checker.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
 #
 # Copyright (C) 2014 The Android Open Source Project
 #
@@ -71,6 +71,7 @@
 #   constant folding returns an integer constant with value either 11 or 22.
 #
 
+from __future__ import print_function
 import argparse
 import os
 import re

tools/checker_test.py

diff --git a/tools/checker_test.py b/tools/checker_test.py
index 1466b93..18152b5 100755
--- a/tools/checker_test.py
+++ b/tools/checker_test.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python2
 #
 # Copyright (C) 2014 The Android Open Source Project
 #
@@ -359,6 +359,8 @@
 
 class TestOutputFile_Parse(unittest.TestCase):
   def __parsesTo(self, string, expected):
+    if isinstance(string, str):
+      string = unicode(string)
     outputStream = io.StringIO(string)
     return self.assertEqual(checker.OutputFile(outputStream).groups, expected)
 
@@ -421,6 +423,8 @@
 
 class TestCheckFile_Parse(unittest.TestCase):
   def __parsesTo(self, string, expected):
+    if isinstance(string, str):
+      string = unicode(string)
     checkStream = io.StringIO(string)
     return self.assertEqual(checker.CheckFile("CHECK", checkStream).groups, expected)