Merge branch 'drop-apputils-dependency' into straddle_py2_py3

Conflicts:
	python/google/protobuf/internal/message_factory_test.py
	python/google/protobuf/internal/reflection_test.py
	python/google/protobuf/internal/text_format_test.py

python/google/protobuf/internal/api_implementation_default_test.py

@@ -34,16 +34,16 @@
 
 import os
 import sys
+import unittest
 # Clear environment implementation settings before the google3 imports.
 os.environ.pop('PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION', None)
 os.environ.pop('PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION', None)
 
 # pylint: disable=g-import-not-at-top
-from google.apputils import basetest
 from google.protobuf.internal import api_implementation
 
 
-class ApiImplementationDefaultTest(basetest.TestCase):
+class ApiImplementationDefaultTest(unittest.TestCase):
 
   if sys.version_info.major <= 2:
 
@@ -60,4 +60,4 @@ class ApiImplementationDefaultTest(basetest.TestCase):
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/descriptor_database_test.py

@@ -34,13 +34,14 @@
 
 __author__ = 'matthewtoia@google.com (Matt Toia)'
 
-from google.apputils import basetest
+import unittest
+
 from google.protobuf import descriptor_pb2
 from google.protobuf.internal import factory_test2_pb2
 from google.protobuf import descriptor_database
 
 
-class DescriptorDatabaseTest(basetest.TestCase):
+class DescriptorDatabaseTest(unittest.TestCase):
 
   def testAdd(self):
     db = descriptor_database.DescriptorDatabase()
@@ -62,4 +63,4 @@ class DescriptorDatabaseTest(basetest.TestCase):
         'google.protobuf.python.internal.MessageWithNestedEnumOnly.NestedEnum'))
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/descriptor_pool_test.py

@@ -37,7 +37,6 @@ __author__ = 'matthewtoia@google.com (Matt Toia)'
 import os
 import unittest
 
-from google.apputils import basetest
 from google.protobuf import unittest_pb2
 from google.protobuf import descriptor_pb2
 from google.protobuf.internal import api_implementation
@@ -51,7 +50,7 @@ from google.protobuf import descriptor_pool
 from google.protobuf import symbol_database
 
 
-class DescriptorPoolTest(basetest.TestCase):
+class DescriptorPoolTest(unittest.TestCase):
 
   def setUp(self):
     self.pool = descriptor_pool.DescriptorPool()
@@ -426,7 +425,7 @@ class ExtensionField(object):
     test.assertEqual(self.extended_type, field_desc.containing_type.name)
 
 
-class AddDescriptorTest(basetest.TestCase):
+class AddDescriptorTest(unittest.TestCase):
 
   def _TestMessage(self, prefix):
     pool = descriptor_pool.DescriptorPool()
@@ -588,4 +587,4 @@ TEST2_FILE = ProtoFile(
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/descriptor_python_test.py

@@ -33,22 +33,22 @@
 """Unittest for descriptor.py for the pure Python implementation."""
 
 import os
+import unittest
 os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'python'
 
 # We must set the implementation version above before the google3 imports.
 # pylint: disable=g-import-not-at-top
-from google.apputils import basetest
 from google.protobuf.internal import api_implementation
 # Run all tests from the original module by putting them in our namespace.
 # pylint: disable=wildcard-import
 from google.protobuf.internal.descriptor_test import *
 
 
-class ConfirmPurePythonTest(basetest.TestCase):
+class ConfirmPurePythonTest(unittest.TestCase):
 
   def testImplementationSetting(self):
     self.assertEqual('python', api_implementation.Type())
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/descriptor_test.py

@@ -34,7 +34,8 @@
 
 __author__ = 'robinson@google.com (Will Robinson)'
 
-from google.apputils import basetest
+import unittest
+
 from google.protobuf import unittest_custom_options_pb2
 from google.protobuf import unittest_import_pb2
 from google.protobuf import unittest_pb2
@@ -48,7 +49,7 @@ name: 'TestEmptyMessage'
 """
 
 
-class DescriptorTest(basetest.TestCase):
+class DescriptorTest(unittest.TestCase):
 
   def setUp(self):
     self.my_file = descriptor.FileDescriptor(
@@ -395,7 +396,7 @@ class DescriptorTest(basetest.TestCase):
     self.assertEqual(self.my_file.package, 'protobuf_unittest')
 
 
-class DescriptorCopyToProtoTest(basetest.TestCase):
+class DescriptorCopyToProtoTest(unittest.TestCase):
   """Tests for CopyTo functions of Descriptor."""
 
   def _AssertProtoEqual(self, actual_proto, expected_class, expected_ascii):
@@ -594,7 +595,7 @@ class DescriptorCopyToProtoTest(basetest.TestCase):
         TEST_SERVICE_ASCII)
 
 
-class MakeDescriptorTest(basetest.TestCase):
+class MakeDescriptorTest(unittest.TestCase):
 
   def testMakeDescriptorWithNestedFields(self):
     file_descriptor_proto = descriptor_pb2.FileDescriptorProto()
@@ -676,4 +677,4 @@ class MakeDescriptorTest(basetest.TestCase):
                       options.Extensions[unittest_custom_options_pb2.msgopt].i)
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/generator_test.py

@@ -41,7 +41,8 @@ further ensures that we can use Python protocol message objects as we expect.
 
 __author__ = 'robinson@google.com (Will Robinson)'
 
-from google.apputils import basetest
+import unittest
+
 from google.protobuf.internal import test_bad_identifiers_pb2
 from google.protobuf import unittest_custom_options_pb2
 from google.protobuf import unittest_import_pb2
@@ -55,7 +56,7 @@ from google.protobuf import symbol_database
 MAX_EXTENSION = 536870912
 
 
-class GeneratorTest(basetest.TestCase):
+class GeneratorTest(unittest.TestCase):
 
   def testNestedMessageDescriptor(self):
     field_name = 'optional_nested_message'
@@ -301,7 +302,7 @@ class GeneratorTest(basetest.TestCase):
         self.assertIsNone(field_desc.containing_oneof)
 
 
-class SymbolDatabaseRegistrationTest(basetest.TestCase):
+class SymbolDatabaseRegistrationTest(unittest.TestCase):
   """Checks that messages, enums and files are correctly registered."""
 
   def testGetSymbol(self):
@@ -340,4 +341,4 @@ class SymbolDatabaseRegistrationTest(basetest.TestCase):
             'google/protobuf/unittest.proto').name)
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/message_factory_python_test.py

@@ -33,22 +33,22 @@
 """Tests for ..public.message_factory for the pure Python implementation."""
 
 import os
+import unittest
 os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'python'
 
 # We must set the implementation version above before the google3 imports.
 # pylint: disable=g-import-not-at-top
-from google.apputils import basetest
 from google.protobuf.internal import api_implementation
 # Run all tests from the original module by putting them in our namespace.
 # pylint: disable=wildcard-import
 from google.protobuf.internal.message_factory_test import *
 
 
-class ConfirmPurePythonTest(basetest.TestCase):
+class ConfirmPurePythonTest(unittest.TestCase):
 
   def testImplementationSetting(self):
     self.assertEqual('python', api_implementation.Type())
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/message_factory_test.py

@@ -34,7 +34,8 @@
 
 __author__ = 'matthewtoia@google.com (Matt Toia)'
 
-from google.apputils import basetest
+import unittest
+
 from google.protobuf import descriptor_pb2
 from google.protobuf.internal import factory_test1_pb2
 from google.protobuf.internal import factory_test2_pb2
@@ -43,7 +44,7 @@ from google.protobuf import descriptor_pool
 from google.protobuf import message_factory
 
 
-class MessageFactoryTest(basetest.TestCase):
+class MessageFactoryTest(unittest.TestCase):
 
   def setUp(self):
     self.factory_test1_fd = descriptor_pb2.FileDescriptorProto.FromString(
@@ -104,17 +105,18 @@ class MessageFactoryTest(basetest.TestCase):
     for _ in range(2):
       messages = message_factory.GetMessages([self.factory_test2_fd,
                                               self.factory_test1_fd])
-      self.assertContainsSubset(
-          ['google.protobuf.python.internal.Factory2Message',
-           'google.protobuf.python.internal.Factory1Message'],
-          list(messages.keys()))
+      self.assertTrue(
+          set(['google.protobuf.python.internal.Factory2Message',
+               'google.protobuf.python.internal.Factory1Message'],
+             ).issubset(set(messages.keys())))
       self._ExerciseDynamicClass(
           messages['google.protobuf.python.internal.Factory2Message'])
-      self.assertContainsSubset(
-          ['google.protobuf.python.internal.Factory2Message.one_more_field',
-           'google.protobuf.python.internal.another_field'],
-          (list(messages['google.protobuf.python.internal.Factory1Message']
-           ._extensions_by_name.keys())))
+      self.assertTrue(
+          set(['google.protobuf.python.internal.Factory2Message.one_more_field',
+               'google.protobuf.python.internal.another_field'],
+             ).issubset(
+                set(messages['google.protobuf.python.internal.Factory1Message']
+                     ._extensions_by_name.keys())))
       factory_msg1 = messages['google.protobuf.python.internal.Factory1Message']
       msg1 = messages['google.protobuf.python.internal.Factory1Message']()
       ext1 = factory_msg1._extensions_by_name[
@@ -128,4 +130,4 @@ class MessageFactoryTest(basetest.TestCase):
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/message_python_test.py

@@ -33,22 +33,22 @@
 """Tests for ..public.message for the pure Python implementation."""
 
 import os
+import unittest
 os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'python'
 
 # We must set the implementation version above before the google3 imports.
 # pylint: disable=g-import-not-at-top
-from google.apputils import basetest
 from google.protobuf.internal import api_implementation
 # Run all tests from the original module by putting them in our namespace.
 # pylint: disable=wildcard-import
 from google.protobuf.internal.message_test import *
 
 
-class ConfirmPurePythonTest(basetest.TestCase):
+class ConfirmPurePythonTest(unittest.TestCase):
 
   def testImplementationSetting(self):
     self.assertEqual('python', api_implementation.Type())
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/message_test.py

@@ -48,8 +48,8 @@ import math
 import operator
 import pickle
 import sys
+import unittest
 
-from google.apputils import basetest
 from google.protobuf import unittest_pb2
 from google.protobuf.internal import api_implementation
 from google.protobuf.internal import test_util
@@ -69,7 +69,7 @@ def IsNegInf(val):
   return isinf(val) and (val < 0)
 
 
-class MessageTest(basetest.TestCase):
+class MessageTest(unittest.TestCase):
 
   def testBadUtf8String(self):
     if api_implementation.Type() != 'python':
@@ -695,7 +695,7 @@ class MessageTest(basetest.TestCase):
       m.HasField('repeated_int32')
 
 
-class ValidTypeNamesTest(basetest.TestCase):
+class ValidTypeNamesTest(unittest.TestCase):
 
   def assertImportFromName(self, msg, base_name):
     # Parse <type 'module.class_name'> to extra 'some.name' as a string.
@@ -718,4 +718,4 @@ class ValidTypeNamesTest(basetest.TestCase):
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/proto_builder_test.py

@@ -32,7 +32,7 @@
 
 """Tests for google.protobuf.proto_builder."""
 
-from google.apputils import basetest
+import unittest
 
 from google.protobuf import descriptor_pb2
 from google.protobuf import descriptor_pool
@@ -40,7 +40,7 @@ from google.protobuf import proto_builder
 from google.protobuf import text_format
 
 
-class ProtoBuilderTest(basetest.TestCase):
+class ProtoBuilderTest(unittest.TestCase):
 
   def setUp(self):
     self._fields = {
@@ -74,4 +74,4 @@ class ProtoBuilderTest(basetest.TestCase):
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/reflection_test.py

@@ -39,10 +39,10 @@ import copy
 import gc
 import operator
 import struct
+import unittest
 
 import six
 
-from google.apputils import basetest
 from google.protobuf import unittest_import_pb2
 from google.protobuf import unittest_mset_pb2
 from google.protobuf import unittest_pb2
@@ -104,7 +104,7 @@ class _MiniDecoder(object):
     return self._pos == len(self._bytes)
 
 
-class ReflectionTest(basetest.TestCase):
+class ReflectionTest(unittest.TestCase):
 
   def assertListsEqual(self, values, others):
     self.assertEqual(len(values), len(others))
@@ -1623,7 +1623,7 @@ class ReflectionTest(basetest.TestCase):
     self.assertFalse(proto.IsInitialized(errors))
     self.assertEqual(errors, ['a', 'b', 'c'])
 
-  @basetest.unittest.skipIf(
+  @unittest.skipIf(
       api_implementation.Type() != 'cpp' or api_implementation.Version() != 2,
       'Errors are only available from the most recent C++ implementation.')
   def testFileDescriptorErrors(self):
@@ -1801,7 +1801,7 @@ class ReflectionTest(basetest.TestCase):
 #  into separate TestCase classes.
 
 
-class TestAllTypesEqualityTest(basetest.TestCase):
+class TestAllTypesEqualityTest(unittest.TestCase):
 
   def setUp(self):
     self.first_proto = unittest_pb2.TestAllTypes()
@@ -1817,7 +1817,7 @@ class TestAllTypesEqualityTest(basetest.TestCase):
     self.assertEqual(self.first_proto, self.second_proto)
 
 
-class FullProtosEqualityTest(basetest.TestCase):
+class FullProtosEqualityTest(unittest.TestCase):
 
   """Equality tests using completely-full protos as a starting point."""
 
@@ -1903,7 +1903,7 @@ class FullProtosEqualityTest(basetest.TestCase):
     self.assertEqual(self.first_proto, self.second_proto)
 
 
-class ExtensionEqualityTest(basetest.TestCase):
+class ExtensionEqualityTest(unittest.TestCase):
 
   def testExtensionEquality(self):
     first_proto = unittest_pb2.TestAllExtensions()
@@ -1936,7 +1936,7 @@ class ExtensionEqualityTest(basetest.TestCase):
     self.assertEqual(first_proto, second_proto)
 
 
-class MutualRecursionEqualityTest(basetest.TestCase):
+class MutualRecursionEqualityTest(unittest.TestCase):
 
   def testEqualityWithMutualRecursion(self):
     first_proto = unittest_pb2.TestMutualRecursionA()
@@ -1948,7 +1948,7 @@ class MutualRecursionEqualityTest(basetest.TestCase):
     self.assertEqual(first_proto, second_proto)
 
 
-class ByteSizeTest(basetest.TestCase):
+class ByteSizeTest(unittest.TestCase):
 
   def setUp(self):
     self.proto = unittest_pb2.TestAllTypes()
@@ -2244,7 +2244,7 @@ class ByteSizeTest(basetest.TestCase):
 #   * Handling of empty submessages (with and without "has"
 #     bits set).
 
-class SerializationTest(basetest.TestCase):
+class SerializationTest(unittest.TestCase):
 
   def testSerializeEmtpyMessage(self):
     first_proto = unittest_pb2.TestAllTypes()
@@ -2795,7 +2795,7 @@ class SerializationTest(basetest.TestCase):
     self.assertEqual(3, proto.repeated_int32[2])
 
 
-class OptionsTest(basetest.TestCase):
+class OptionsTest(unittest.TestCase):
 
   def testMessageOptions(self):
     proto = unittest_mset_pb2.TestMessageSet()
@@ -2822,9 +2822,9 @@ class OptionsTest(basetest.TestCase):
 
 
 
-class ClassAPITest(basetest.TestCase):
+class ClassAPITest(unittest.TestCase):
 
-  @basetest.unittest.skipIf(
+  @unittest.skipIf(
       api_implementation.Type() == 'cpp' and api_implementation.Version() == 2,
       'C++ implementation requires a call to MakeDescriptor()')
   def testMakeClassWithNestedDescriptor(self):
@@ -2955,4 +2955,4 @@ class ClassAPITest(basetest.TestCase):
     self.assertEqual(msg.bar.baz.deep, 4)
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/service_reflection_test.py

@@ -34,13 +34,14 @@
 
 __author__ = 'petar@google.com (Petar Petrov)'
 
-from google.apputils import basetest
+import unittest
+
 from google.protobuf import unittest_pb2
 from google.protobuf import service_reflection
 from google.protobuf import service
 
 
-class FooUnitTest(basetest.TestCase):
+class FooUnitTest(unittest.TestCase):
 
   def testService(self):
     class MockRpcChannel(service.RpcChannel):
@@ -133,4 +134,4 @@ class FooUnitTest(basetest.TestCase):
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/symbol_database_test.py

@@ -32,12 +32,13 @@
 
 """Tests for google.protobuf.symbol_database."""
 
-from google.apputils import basetest
+import unittest
+
 from google.protobuf import unittest_pb2
 from google.protobuf import symbol_database
 
 
-class SymbolDatabaseTest(basetest.TestCase):
+class SymbolDatabaseTest(unittest.TestCase):
 
   def _Database(self):
     db = symbol_database.SymbolDatabase()
@@ -117,4 +118,4 @@ class SymbolDatabaseTest(basetest.TestCase):
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/text_encoding_test.py

@@ -32,7 +32,8 @@
 
 """Tests for google.protobuf.text_encoding."""
 
-from google.apputils import basetest
+import unittest
+
 from google.protobuf import text_encoding
 
 TEST_VALUES = [
@@ -50,7 +51,7 @@ TEST_VALUES = [
      b"\010\011\012\013\014\015")]
 
 
-class TextEncodingTestCase(basetest.TestCase):
+class TextEncodingTestCase(unittest.TestCase):
   def testCEscape(self):
     for escaped, escaped_utf8, unescaped in TEST_VALUES:
       self.assertEquals(escaped,
@@ -65,4 +66,4 @@ class TextEncodingTestCase(basetest.TestCase):
 
 
 if __name__ == "__main__":
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/text_format_test.py

@@ -35,16 +35,16 @@
 __author__ = 'kenton@google.com (Kenton Varda)'
 
 import re
+import unittest
 
 import six
 
-from google.apputils import basetest
 from google.protobuf import text_format
 from google.protobuf.internal import test_util
 from google.protobuf import unittest_pb2
 from google.protobuf import unittest_mset_pb2
 
-class TextFormatTest(basetest.TestCase):
+class TextFormatTest(unittest.TestCase):
 
   def ReadGolden(self, golden_filename):
     with test_util.GoldenFile(golden_filename) as f:
@@ -601,7 +601,7 @@ class TextFormatTest(basetest.TestCase):
     self.assertEqual('oneof_uint32', m2.WhichOneof('oneof_field'))
 
 
-class TokenizerTest(basetest.TestCase):
+class TokenizerTest(unittest.TestCase):
 
   def testSimpleTokenCases(self):
     text = ('identifier1:"string1"\n     \n\n'
@@ -746,4 +746,4 @@ class TokenizerTest(basetest.TestCase):
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/unknown_fields_test.py

@@ -35,7 +35,8 @@
 
 __author__ = 'bohdank@google.com (Bohdan Koval)'
 
-from google.apputils import basetest
+import unittest
+
 from google.protobuf import unittest_mset_pb2
 from google.protobuf import unittest_pb2
 from google.protobuf.internal import api_implementation
@@ -45,10 +46,10 @@ from google.protobuf.internal import test_util
 from google.protobuf.internal import type_checkers
 
 
-@basetest.unittest.skipIf(
+@unittest.skipIf(
     api_implementation.Type() == 'cpp' and api_implementation.Version() == 2,
     'C++ implementation does not expose unknown fields to Python')
-class UnknownFieldsTest(basetest.TestCase):
+class UnknownFieldsTest(unittest.TestCase):
 
   def setUp(self):
     self.descriptor = unittest_pb2.TestAllTypes.DESCRIPTOR
@@ -179,10 +180,10 @@ class UnknownFieldsTest(basetest.TestCase):
     self.assertNotEqual(self.empty_message, message)
 
 
-@basetest.unittest.skipIf(
+@unittest.skipIf(
     api_implementation.Type() == 'cpp' and api_implementation.Version() == 2,
     'C++ implementation does not expose unknown fields to Python')
-class UnknownEnumValuesTest(basetest.TestCase):
+class UnknownEnumValuesTest(unittest.TestCase):
 
   def setUp(self):
     self.descriptor = missing_enum_values_pb2.TestEnumValues.DESCRIPTOR
@@ -235,4 +236,4 @@ class UnknownEnumValuesTest(basetest.TestCase):
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/internal/wire_format_test.py

@@ -34,12 +34,13 @@
 
 __author__ = 'robinson@google.com (Will Robinson)'
 
-from google.apputils import basetest
+import unittest
+
 from google.protobuf import message
 from google.protobuf.internal import wire_format
 
 
-class WireFormatTest(basetest.TestCase):
+class WireFormatTest(unittest.TestCase):
 
   def testPackTag(self):
     field_number = 0xabc
@@ -250,4 +251,4 @@ class WireFormatTest(basetest.TestCase):
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/pyext/descriptor_cpp2_test.py

@@ -35,19 +35,19 @@
 __author__ = 'anuraag@google.com (Anuraag Agrawal)'
 
 import os
+import unittest
 os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'cpp'
 os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION'] = '2'
 
 # We must set the implementation version above before the google3 imports.
 # pylint: disable=g-import-not-at-top
-from google.apputils import basetest
 from google.protobuf.internal import api_implementation
 # Run all tests from the original module by putting them in our namespace.
 # pylint: disable=wildcard-import
 from google.protobuf.internal.descriptor_test import *
 
 
-class ConfirmCppApi2Test(basetest.TestCase):
+class ConfirmCppApi2Test(unittest.TestCase):
 
   def testImplementationSetting(self):
     self.assertEqual('cpp', api_implementation.Type())
@@ -55,4 +55,4 @@ class ConfirmCppApi2Test(basetest.TestCase):
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/pyext/message_factory_cpp2_test.py

@@ -33,19 +33,19 @@
 """Tests for google.protobuf.message_factory."""
 
 import os
+import unittest
 os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'cpp'
 os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION'] = '2'
 
 # We must set the implementation version above before the google3 imports.
 # pylint: disable=g-import-not-at-top
-from google.apputils import basetest
 from google.protobuf.internal import api_implementation
 # Run all tests from the original module by putting them in our namespace.
 # pylint: disable=wildcard-import
 from google.protobuf.internal.message_factory_test import *
 
 
-class ConfirmCppApi2Test(basetest.TestCase):
+class ConfirmCppApi2Test(unittest.TestCase):
 
   def testImplementationSetting(self):
     self.assertEqual('cpp', api_implementation.Type())
@@ -53,4 +53,4 @@ class ConfirmCppApi2Test(basetest.TestCase):
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/google/protobuf/pyext/reflection_cpp2_generated_test.py

@@ -36,17 +36,17 @@
 __author__ = 'jasonh@google.com (Jason Hsueh)'
 
 import os
+import unittest
 os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION'] = 'cpp'
 os.environ['PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION_VERSION'] = '2'
 
-from google.apputils import basetest
 from google.protobuf.internal import api_implementation
 from google.protobuf.internal import more_extensions_dynamic_pb2
 from google.protobuf.internal import more_extensions_pb2
 from google.protobuf.internal.reflection_test import *
 
 
-class ReflectionCppTest(basetest.TestCase):
+class ReflectionCppTest(unittest.TestCase):
   def testImplementationSetting(self):
     self.assertEqual('cpp', api_implementation.Type())
     self.assertEqual(2, api_implementation.Version())
@@ -91,4 +91,4 @@ class ReflectionCppTest(basetest.TestCase):
 
 
 if __name__ == '__main__':
-  basetest.main()
+  unittest.main()

python/setup.py

@@ -197,11 +197,6 @@ if __name__ == '__main__':
           'google.protobuf.text_format'],
         cmdclass = { 'clean': clean, 'build_py': build_py },
         install_requires = ['setuptools'],
-        # TODO: Restore dependency once a Python 3 compatible google-apputils
-        # is released.
-        setup_requires = (['google-apputils']
-                          if sys.version_info[0] < 3 else
-                          []),
         ext_modules = ext_module_list,
         url = 'https://developers.google.com/protocol-buffers/',
         maintainer = maintainer_email,