diff options
author | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 11:01:32 -0800 |
---|---|---|
committer | Feng Xiao <xfxyjwf@gmail.com> | 2014-11-11 11:01:32 -0800 |
commit | 643d09ac7dcbf3b014a8a0465ebc4405ac8388b7 (patch) | |
tree | 67abff5f87181bf73ae4b7588028647d6126a7d7 /python | |
parent | 6ef984af4b0c63c1c33127a12dcfc8e6359f0c9e (diff) | |
parent | c76807211af6ae86368bcd7651ca707ee7f12f86 (diff) | |
download | protobuf-643d09ac7dcbf3b014a8a0465ebc4405ac8388b7.tar.gz protobuf-643d09ac7dcbf3b014a8a0465ebc4405ac8388b7.tar.bz2 protobuf-643d09ac7dcbf3b014a8a0465ebc4405ac8388b7.zip |
Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobuf into typo
Conflicts:
src/google/protobuf/compiler/java/java_file.cc
Diffstat (limited to 'python')
-rwxr-xr-x | python/google/protobuf/internal/generator_test.py | 2 | ||||
-rwxr-xr-x | python/google/protobuf/internal/service_reflection_test.py | 2 | ||||
-rw-r--r-- | python/google/protobuf/pyext/message.h | 2 | ||||
-rw-r--r-- | python/google/protobuf/pyext/repeated_composite_container.h | 2 | ||||
-rw-r--r-- | python/google/protobuf/pyext/scoped_pyobject_ptr.h | 2 | ||||
-rwxr-xr-x | python/mox.py | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/python/google/protobuf/internal/generator_test.py b/python/google/protobuf/internal/generator_test.py index 14b05cca..303d3e03 100755 --- a/python/google/protobuf/internal/generator_test.py +++ b/python/google/protobuf/internal/generator_test.py @@ -149,7 +149,7 @@ class GeneratorTest(basetest.TestCase): proto = unittest_custom_options_pb2.TestMessageWithCustomOptions() enum_options = proto.DESCRIPTOR.enum_types_by_name['AnEnum'].GetOptions() self.assertTrue(enum_options is not None) - # TODO(gps): We really should test for the presense of the enum_opt1 + # TODO(gps): We really should test for the presence of the enum_opt1 # extension and for its value to be set to -789. def testNestedTypes(self): diff --git a/python/google/protobuf/internal/service_reflection_test.py b/python/google/protobuf/internal/service_reflection_test.py index 07dcf445..d066ae70 100755 --- a/python/google/protobuf/internal/service_reflection_test.py +++ b/python/google/protobuf/internal/service_reflection_test.py @@ -118,7 +118,7 @@ class FooUnitTest(basetest.TestCase): rpc_controller = 'controller' request = 'request' - # GetDescriptor now static, still works as instance method for compatability + # GetDescriptor now static, still works as instance method for compatibility self.assertEqual(unittest_pb2.TestService_Stub.GetDescriptor(), stub.GetDescriptor()) diff --git a/python/google/protobuf/pyext/message.h b/python/google/protobuf/pyext/message.h index 73e5a7d3..0fef92a0 100644 --- a/python/google/protobuf/pyext/message.h +++ b/python/google/protobuf/pyext/message.h @@ -142,7 +142,7 @@ PyObject* InternalGetSubMessage( // // Releases messages to the provided cmessage_list if it is not NULL rather // than just removing them from the underlying proto. This cmessage_list must -// have a CMessage for each underlying submessage. The CMessages refered to +// have a CMessage for each underlying submessage. The CMessages referred to // by slice will be removed from cmessage_list by this function. // // Corresponds to reflection api method RemoveLast. diff --git a/python/google/protobuf/pyext/repeated_composite_container.h b/python/google/protobuf/pyext/repeated_composite_container.h index a76a5d6a..0969af08 100644 --- a/python/google/protobuf/pyext/repeated_composite_container.h +++ b/python/google/protobuf/pyext/repeated_composite_container.h @@ -61,7 +61,7 @@ struct CMessage; // // When in the attached state all modifications to the container are // done both on the 'message' and on the 'child_messages' -// list. In this state all Messages refered to by the children in +// list. In this state all Messages referred to by the children in // 'child_messages' are owner by the 'owner'. // // When in the released state 'message', 'owner', 'parent', and diff --git a/python/google/protobuf/pyext/scoped_pyobject_ptr.h b/python/google/protobuf/pyext/scoped_pyobject_ptr.h index fefebb6a..18ddd5cd 100644 --- a/python/google/protobuf/pyext/scoped_pyobject_ptr.h +++ b/python/google/protobuf/pyext/scoped_pyobject_ptr.h @@ -40,7 +40,7 @@ namespace google { class ScopedPyObjectPtr { public: - // Constructor. Defaults to intializing with NULL. + // Constructor. Defaults to initializing with NULL. // There is no way to create an uninitialized ScopedPyObjectPtr. explicit ScopedPyObjectPtr(PyObject* p = NULL) : ptr_(p) { } diff --git a/python/mox.py b/python/mox.py index ce80ba50..257468e5 100755 --- a/python/mox.py +++ b/python/mox.py @@ -31,7 +31,7 @@ If an unexpected method (or an expected method with unexpected parameters) is called, then an exception will be raised. Once you are done interacting with the mock, you need to verify that -all the expected interactions occured. (Maybe your code exited +all the expected interactions occurred. (Maybe your code exited prematurely without calling some cleanup method!) The verify phase ensures that every expected method was called; otherwise, an exception will be raised. |