aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/internal/descriptor_pool_test.py
Commit message (Collapse)AuthorAge
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|
* Fixed descriptor_pool_test.py for Python 2.6Gravatar Adam Cozzette2016-11-22
| | | | | The curly brace syntax for sets was introduced in Python 2.7, and so for compatibility with 2.6 we need to avoid using it for now.
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
|
* Integrate internal changesGravatar Bo Yang2016-10-10
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
| | | | This includes all internal changes from around May 20 to now.
* Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
|
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
|
* Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
|
* Revert back changes to import unittest2 for py26Gravatar Jisi Liu2015-10-05
|
* Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
|
* Get Python 2.6 working.Gravatar Dan O'Reilly2015-08-14
| | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* Merge remote-tracking branch 'upstream/master' into py2_py3_straddleGravatar Dan O'Reilly2015-08-12
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: python/google/protobuf/descriptor_pool.py python/google/protobuf/internal/api_implementation_default_test.py python/google/protobuf/internal/cpp_message.py python/google/protobuf/internal/descriptor_database_test.py python/google/protobuf/internal/descriptor_pool_test.py python/google/protobuf/internal/descriptor_python_test.py python/google/protobuf/internal/descriptor_test.py python/google/protobuf/internal/generator_test.py python/google/protobuf/internal/message_factory_python_test.py python/google/protobuf/internal/message_factory_test.py python/google/protobuf/internal/message_test.py python/google/protobuf/internal/proto_builder_test.py python/google/protobuf/internal/python_message.py python/google/protobuf/internal/reflection_test.py python/google/protobuf/internal/service_reflection_test.py python/google/protobuf/internal/symbol_database_test.py python/google/protobuf/internal/text_encoding_test.py python/google/protobuf/internal/text_format_test.py python/google/protobuf/internal/unknown_fields_test.py python/google/protobuf/internal/wire_format_test.py python/google/protobuf/pyext/descriptor_cpp2_test.py python/google/protobuf/pyext/message_factory_cpp2_test.py python/google/protobuf/pyext/reflection_cpp2_generated_test.py python/setup.py ruby/lib/google/protobuf/message_exts.rb
| * down-integrate internal changesGravatar Bo Yang2015-05-21
| |
| * Don't hard-code the python pathGravatar Tamir Duberstein2015-05-06
| |
| * [PYTHON] Drop dependency on 'google.apputils'.Gravatar Tamir Duberstein2015-04-10
| | | | | | | | Use stdlib's 'unittest' instead.
* | Straddle Python 2.6, 2.7, 3.3, 3.4.Gravatar Tres Seaver2015-01-13
| |
* | Drop dependency on 'google.apputils'.Gravatar Tres Seaver2015-01-13
|/ | | | Use stdlib's 'unittest' instead.
* Down-integrate from internal code base.Gravatar Feng Xiao2014-11-10
|
* Replace links to code.google.com/protobuf with ↵Gravatar Feng Xiao2014-10-01
| | | | developers.google.com/protocol-buffers
* down integrate python opensource to svnGravatar jieluo@google.com2014-08-12
|
* Down-integrate from internal branchGravatar xiaofeng@google.com2012-09-22
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-13 18:40:54 +0000