Merge pull request #1491 from gennadiycivil/master

merges-6

googletest/test/gtest_json_outfiles_test.py

@@ -32,9 +32,8 @@
 
 import json
 import os
-import gtest_test_utils
 import gtest_json_test_utils
-
+import gtest_test_utils
 
 GTEST_OUTPUT_SUBDIR = 'json_outfiles'
 GTEST_OUTPUT_1_TEST = 'gtest_xml_outfile1_test_'

googletest/test/gtest_json_output_unittest.py

@@ -37,9 +37,8 @@ import os
 import re
 import sys
 
-import gtest_test_utils
 import gtest_json_test_utils
-
+import gtest_test_utils
 
 GTEST_FILTER_FLAG = '--gtest_filter'
 GTEST_LIST_TESTS_FLAG = '--gtest_list_tests'

googletest/test/gtest_json_test_utils.py

@@ -44,7 +44,7 @@ def normalize(obj):
   """
   def _normalize(key, value):
     if key == 'time':
-      return re.sub(r'^\d+(\.\d+)?s$', u'*', value)
+      return re.sub(r'^\d+(\.\d+)?s$', '*', value)
     elif key == 'timestamp':
       return re.sub(r'^\d{4}-\d\d-\d\dT\d\d:\d\d:\d\dZ$', '*', value)
     elif key == 'failure':

googletest/test/gtest_test_utils.py

@@ -227,7 +227,7 @@ class Subprocess:
                                combined in a string.
     """
 
-    # The subprocess module is the preferable way of running programs
+    # The subprocess module is the preferrable way of running programs
     # since it is available and behaves consistently on all platforms,
     # including Windows. But it is only available starting in python 2.4.
     # In earlier python versions, we revert to the popen2 module, which is

googletest/test/gtest_uninitialized_test.py

@@ -33,7 +33,6 @@
 
 __author__ = 'wan@google.com (Zhanyong Wan)'
 
-import os
 import gtest_test_utils
 
 COMMAND = gtest_test_utils.GetTestExecutablePath('gtest_uninitialized_test_')