Fix FullScreen crash in Webapp

[platform/framework/web/chromium-efl.git] / testing / merge_scripts / standard_gtest_merge_test.py

diff --git a/testing/merge_scripts/standard_gtest_merge_test.py b/testing/merge_scripts/standard_gtest_merge_test.py
index 586534a..14a5b9d 100755 (executable)
--- a/testing/merge_scripts/standard_gtest_merge_test.py
+++ b/testing/merge_scripts/standard_gtest_merge_test.py
@@ -1,18 +1,19 @@
-#!/usr/bin/env vpython
-# Copyright 2014 The Chromium Authors. All rights reserved.
+#!/usr/bin/env vpython3
+# Copyright 2014 The Chromium Authors
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import cStringIO
 import json
 import logging
 import os
 import shutil
+import six
 import sys
 import tempfile
 import unittest
 
 import common_merge_script_tests
+import six
 
 THIS_DIR = os.path.dirname(os.path.abspath(__file__))
 
@@ -381,7 +382,7 @@ class LoadShardJsonTest(_StandardGtestMergeTest):
 
   def test_double_digit_jsons(self):
     jsons_to_merge = []
-    for i in xrange(15):
+    for i in range(15):
       json_dir = os.path.join(self.temp_dir, str(i))
       json_path = os.path.join(json_dir, 'output.json')
       if not os.path.exists(json_dir):
@@ -402,7 +403,7 @@ class LoadShardJsonTest(_StandardGtestMergeTest):
 
   def test_double_task_id_jsons(self):
     jsons_to_merge = []
-    for i in xrange(15):
+    for i in range(15):
       json_dir = os.path.join(self.temp_dir, 'deadbeef%d' % i)
       json_path = os.path.join(json_dir, 'output.json')
       if not os.path.exists(json_dir):
@@ -427,19 +428,21 @@ class LoadShardJsonTest(_StandardGtestMergeTest):
 class MergeShardResultsTest(_StandardGtestMergeTest):
   """Tests for merge_shard_results function."""
 
+  # pylint: disable=super-with-arguments
   def setUp(self):
     super(MergeShardResultsTest, self).setUp()
     self.summary = None
     self.test_files = []
+  # pylint: enable=super-with-arguments
 
   def stage(self, summary, files):
     self.summary = self._write_temp_file('summary.json', summary)
-    for path, content in files.iteritems():
+    for path, content in files.items():
       abs_path = self._write_temp_file(path, content)
       self.test_files.append(abs_path)
 
   def call(self):
-    stdout = cStringIO.StringIO()
+    stdout = six.StringIO()
     with mock.patch('sys.stdout', stdout):
       merged = standard_gtest_merge.merge_shard_results(
           self.summary, self.test_files)
@@ -448,7 +451,7 @@ class MergeShardResultsTest(_StandardGtestMergeTest):
   def assertUnicodeEquals(self, expectation, result):
     def convert_to_unicode(key_or_value):
       if isinstance(key_or_value, str):
-        return unicode(key_or_value)
+        return six.text_type(key_or_value)
       if isinstance(key_or_value, dict):
         return {convert_to_unicode(k): convert_to_unicode(v)
                 for k, v in key_or_value.items()}
@@ -599,8 +602,10 @@ class MergeShardResultsTest(_StandardGtestMergeTest):
 
 class CommandLineTest(common_merge_script_tests.CommandLineTest):
 
+  # pylint: disable=super-with-arguments
   def __init__(self, methodName='runTest'):
     super(CommandLineTest, self).__init__(methodName, standard_gtest_merge)
+  # pylint: enable=super-with-arguments
 
 
 if __name__ == '__main__':