aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/internal/message_test.py
Commit message (Collapse)AuthorAgeFilesLines
* Merge from google internalJisi Liu2017-10-181-2/+12
|
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-15/+193
|
* Merge pull request #3529 from pherl/merge3.4.xJisi Liu2017-08-211-0/+95
|\ | | | | Merge 3.4.x into master
| * Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-181-0/+95
| |\
| | * Add __bool__ as well as __nonzero__ for python3Jie Luo2017-07-241-0/+3
| | |
| | * Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-0/+92
| | |
* | | remove the parens from the cmp() lambda definition (#3526)cclauss2017-08-211-2/+2
|/ / | | | | | | | | | | | | | | | | | | * remove the parens from the cmp() lambda definition https://github.com/PythonCharmers/python-future/pull/298 * remove the parens from the cmp() lambda definition https://github.com/PythonCharmers/python-future/pull/298
* | Define cmp() for Python 3 (#3517)cclauss2017-08-181-1/+5
| | | | | | | | | | | | | | | | | | | | * Define cmp() for Python 3 http://python-future.org/compatible_idioms.html?highlight=cmp#cmp * Define cmp() for Python 3 http://python-future.org/compatible_idioms.html?highlight=cmp#cmp
* | Skip setUpClass which is newly added in python2.7 for python2.6Jie Luo2017-08-041-2/+3
|/
* Down-integrate from google3.Feng Xiao2017-03-291-1/+26
|
* Integrate internal changesBo Yang2016-10-101-15/+30
|
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-0/+4
| | | | This includes all internal changes from around May 20 to now.
* Down integrate from Google internal.Jisi Liu2016-04-281-4/+30
|
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-011-0/+59
|\
| * Added an API to allow oversize protos when using C++ extension in PythonManjunath Kudlur2016-03-311-0/+59
| |
* | Integrate google internal changes.Jisi Liu2016-03-301-33/+20
|/
* Down-integrate from internal code base.Feng Xiao2015-12-111-15/+66
|
* Revert back changes to import unittest2 for py26Jisi Liu2015-10-051-1/+4
|
* Down-integrate from google internal.Jisi Liu2015-10-051-12/+8
|
* Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-251-27/+31
|\
| * Use assertIsInstanceTamir Duberstein2015-08-221-11/+8
| |
| * Get Python 2.6 working.Dan O'Reilly2015-08-141-9/+12
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Fix some more Python 3 compat issuesDan O'Reilly2015-08-141-10/+15
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-121-185/+1074
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Straddle Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-131-9/+9
| | |
| * | Drop dependency on 'google.apputils'.Tres Seaver2015-01-131-4/+4
| | | | | | | | | | | | Use stdlib's 'unittest' instead.
* | | Down-integrate from google3.Feng Xiao2015-08-221-0/+115
| |/ |/|
* | down-integrate internal changesBo Yang2015-05-211-25/+496
| |
* | Don't hard-code the python pathTamir Duberstein2015-05-061-1/+1
| |
* | [PYTHON] Drop dependency on 'google.apputils'.Tamir Duberstein2015-04-101-6/+5
| | | | | | | | Use stdlib's 'unittest' instead.
* | Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-1/+2
| | | | | | | | | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
* | Fixes for Python/C++ implementation in open-source:Josh Haberman2015-02-251-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | * Rosy hack doesn't apply (that test should be removed for the open-source release). * Added our own copy of parameterized.py (the open-source version of Google Apputils doesn't contain it). * The C++ Descriptor object didn't implement extension_ranges. * Had to implement a hack around returning EncodeError, to work around the module-loading behavior of the test runner.
* | Down integrate from Google internal.Jisi Liu2015-02-251-181/+601
|/ | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145
* Down-integrate from internal code base.Feng Xiao2014-11-101-0/+40
|
* Down-integrate from internal branch.Feng Xiao2014-10-071-1/+6
|
* 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-46/+228
|
* Down-integrate from internal branchxiaofeng@google.com2012-09-221-15/+166
|
* Submit recent changes from internal branch. See CHANGES.txt for more details.liujisi@google.com2010-11-021-0/+254
|
* Massive roll-up of changes. See CHANGES.txt.kenton@google.com2009-12-181-3/+39
|
* Submit recent changes from internal branch, including "lite mode" forkenton@google.com2009-07-291-0/+53
C++ and Java. See CHANGES.txt for more details.