aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/internal/unknown_fields_test.py
Commit message (Collapse)AuthorAgeFilesLines
* Down-integrate from google3.Feng Xiao2018-08-081-42/+123
|
* Merge from google internalJisi Liu2017-10-181-1/+0
|
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-79/+79
|
* Integrate internal changesBo Yang2016-10-101-45/+62
|
* Down integrate from Google internal.Jisi Liu2016-04-281-0/+20
|
* Integrate google internal changes.Jisi Liu2016-03-301-1/+1
|
* Revert back changes to import unittest2 for py26Jisi Liu2015-10-051-2/+5
|
* Down-integrate from google internal.Jisi Liu2015-10-051-6/+15
|
* Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-251-1/+5
|\
| * Get Python 2.6 working.Dan O'Reilly2015-08-141-12/+4
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-121-48/+74
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Compatibility with Python2.6 unittest.Tres Seaver2015-01-131-2/+13
| | |
| * | Drop dependency on 'google.apputils'.Tres Seaver2015-01-131-6/+7
| | | | | | | | | | | | Use stdlib's 'unittest' instead.
* | | Down-integrate from google3.Feng Xiao2015-08-221-26/+46
| |/ |/|
* | down-integrate internal changesBo Yang2015-05-211-1/+0
| |
* | Don't hard-code the python pathTamir Duberstein2015-05-061-1/+1
| |
* | [PYTHON] Drop dependency on 'google.apputils'.Tamir Duberstein2015-04-101-8/+9
| | | | | | | | Use stdlib's 'unittest' instead.
* | Down integrate from Google internal.Jisi Liu2015-02-251-47/+73
|/ | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145
* Down-integrate from internal code base.Feng Xiao2014-11-101-1/+8
|
* Down-integrate from internal branch.Feng Xiao2014-10-071-2/+2
|
* Replace links to code.google.com/protobuf with ↵Feng Xiao2014-10-011-1/+1
| | | | developers.google.com/protocol-buffers
* down integrate python opensource to svnjieluo@google.com2014-08-121-5/+66
|
* Down-integrate from internal branchxiaofeng@google.com2012-09-221-0/+170