merges-6

2018-03-05 14:21:41 -05:00
parent 731dbc4a78
commit 086825de5d
5 changed files with 4 additions and 7 deletions
--- a/googletest/test/gtest_json_test_utils.py
+++ b/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':