Many code merge/upstream changes

2018-01-23 12:33:54 -05:00
parent 58df576056
commit 80defcec57
16 changed files with 93 additions and 35 deletions
--- a/googletest/test/gtest_env_var_test.py
+++ b/googletest/test/gtest_env_var_test.py
@@ -47,8 +47,8 @@ environ = os.environ.copy()

 def AssertEq(expected, actual):
  if expected != actual:
-    print('Expected: %s' % (expected,))
-    print('  Actual: %s' % (actual,))
+    print 'Expected: %s' % (expected,)
+    print '  Actual: %s' % (actual,)
    raise AssertionError