Fixes for Python/C++ implementation in open-source:

  * Rosy hack doesn't apply (that test should be removed
    for the open-source release).

  * Added our own copy of parameterized.py (the open-source
    version of Google Apputils doesn't contain it).

  * The C++ Descriptor object didn't implement extension_ranges.

  * Had to implement a hack around returning EncodeError, to
    work around the module-loading behavior of the test runner.

1 files changed, 0 insertions, 10 deletions

diff --git a/python/google/protobuf/internal/reflection_test.py b/python/google/protobuf/internal/reflection_test.py
index 8ac76c63..a62d9845 100755
--- a/python/google/protobuf/internal/reflection_test.py
+++ b/python/google/protobuf/internal/reflection_test.py
@@ -1803,16 +1803,6 @@ class ReflectionTest(basetest.TestCase):
     self.assertRaises(TypeError,
                       unittest_pb2.TestAllTypes().__getattribute__, 42)
 
-  @basetest.unittest.skipIf(
-      api_implementation.Type() != 'cpp' or api_implementation.Version() != 2,
-      'CPPv2-specific test')
-  def testRosyHack(self):
-    from google.protobuf.pyext import _message
-    from google3.gdata.rosy.proto import core_api2_pb2
-    from google3.gdata.rosy.proto import core_pb2
-    self.assertEqual(_message.Message, core_pb2.PageSelection.__base__)
-    self.assertEqual(_message.Message, core_api2_pb2.PageSelection.__base__)
-
 
 #  Since we had so many tests for protocol buffer equality, we broke these out
 #  into separate TestCase classes.