third_party/protobuf: Update to HEAD (83d681ee2c)

third_party/protobuf/python/google/protobuf/internal/_parameterized.py

 #! /usr/bin/env python
 #
 # Protocol Buffers - Google's data interchange format
 # Copyright 2008 Google Inc.  All rights reserved.
 # https://developers.google.com/protocol-buffers/
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
@@ skipping 329 matching lines @@
 
 class TestGeneratorMetaclass(type):
   """Metaclass for test cases with test generators.
 
   A test generator is an iterable in a testcase that produces callables. These
   callables must be single-argument methods. These methods are injected into
   the class namespace and the original iterable is removed. If the name of the
   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.
   """
 
   def __new__(mcs, class_name, bases, dct):
     dct['_id_suffix'] = id_suffix = {}
     for name, obj in dct.items():
       if (name.startswith(unittest.TestLoader.testMethodPrefix) and
           _NonStringIterable(obj)):
         iterator = iter(obj)
         dct.pop(name)
@@ skipping 73 matching lines @@
   Returns:
     A new class object.
   """
   metaclass = type(
       'CoopMetaclass',
       (other_base_class.__metaclass__,
        TestGeneratorMetaclass), {})
   return metaclass(
       'CoopParameterizedTestCase',
       (other_base_class, ParameterizedTestCase), {})