From 3808d091f86e079c8f3437f5cd66bd2c507cef8a Mon Sep 17 00:00:00 2001 From: Otto Kekäläinen Date: Sun, 3 Jul 2016 15:26:04 +0300 Subject: Fix spelling in strings and comments --- python/google/protobuf/descriptor.py | 6 +++--- python/google/protobuf/internal/_parameterized.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'python') diff --git a/python/google/protobuf/descriptor.py b/python/google/protobuf/descriptor.py index 2eba1232..873af306 100755 --- a/python/google/protobuf/descriptor.py +++ b/python/google/protobuf/descriptor.py @@ -349,7 +349,7 @@ class Descriptor(_NestedDescriptorBase): Args: proto: An empty descriptor_pb2.DescriptorProto. """ - # This function is overriden to give a better doc comment. + # This function is overridden to give a better doc comment. super(Descriptor, self).CopyToProto(proto) @@ -626,7 +626,7 @@ class EnumDescriptor(_NestedDescriptorBase): Args: proto: An empty descriptor_pb2.EnumDescriptorProto. """ - # This function is overriden to give a better doc comment. + # This function is overridden to give a better doc comment. super(EnumDescriptor, self).CopyToProto(proto) @@ -747,7 +747,7 @@ class ServiceDescriptor(_NestedDescriptorBase): Args: proto: An empty descriptor_pb2.ServiceDescriptorProto. """ - # This function is overriden to give a better doc comment. + # This function is overridden to give a better doc comment. super(ServiceDescriptor, self).CopyToProto(proto) diff --git a/python/google/protobuf/internal/_parameterized.py b/python/google/protobuf/internal/_parameterized.py index dea3f199..23a78f03 100755 --- a/python/google/protobuf/internal/_parameterized.py +++ b/python/google/protobuf/internal/_parameterized.py @@ -347,7 +347,7 @@ class TestGeneratorMetaclass(type): iterable conforms to the test pattern, the injected methods will be picked up as tests by the unittest framework. - In general, it is supposed to be used in conjuction with the + In general, it is supposed to be used in conjunction with the Parameters decorator. """ -- cgit v1.2.3