Merge branch 'master' of github.com:google/googletest
diff --git a/googlemock/include/gmock/gmock-spec-builders.h b/googlemock/include/gmock/gmock-spec-builders.h
index 1f261bd..255d6ad 100644
--- a/googlemock/include/gmock/gmock-spec-builders.h
+++ b/googlemock/include/gmock/gmock-spec-builders.h
@@ -61,6 +61,7 @@
#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
#define GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_
+#include <functional>
#include <map>
#include <memory>
#include <set>
diff --git a/googlemock/test/gmock_output_test.py b/googlemock/test/gmock_output_test.py
index 0527bd9..25f99f2 100755
--- a/googlemock/test/gmock_output_test.py
+++ b/googlemock/test/gmock_output_test.py
@@ -39,6 +39,7 @@
"""
+from io import open # pylint: disable=redefined-builtin, g-importing-member
import os
import re
import sys
@@ -152,10 +153,11 @@
class GMockOutputTest(gmock_test_utils.TestCase):
+
def testOutput(self):
(output, leaky_tests) = GetNormalizedCommandOutputAndLeakyTests(COMMAND)
golden_file = open(GOLDEN_PATH, 'rb')
- golden = golden_file.read()
+ golden = golden_file.read().decode('utf-8')
golden_file.close()
# The normalized output should match the golden file.
