Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge from google internal | Jisi Liu | 2017-10-18 | 1 | -2/+12 |
| | |||||
* | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 1 | -15/+193 |
| | |||||
* | Merge pull request #3529 from pherl/merge3.4.x | Jisi Liu | 2017-08-21 | 1 | -0/+95 |
|\ | | | | | Merge 3.4.x into master | ||||
| * | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 | 1 | -0/+95 |
| |\ | |||||
| | * | Add __bool__ as well as __nonzero__ for python3 | Jie Luo | 2017-07-24 | 1 | -0/+3 |
| | | | |||||
| | * | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 1 | -0/+92 |
| | | | |||||
* | | | remove the parens from the cmp() lambda definition (#3526) | cclauss | 2017-08-21 | 1 | -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) | cclauss | 2017-08-18 | 1 | -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.6 | Jie Luo | 2017-08-04 | 1 | -2/+3 |
|/ | |||||
* | Down-integrate from google3. | Feng Xiao | 2017-03-29 | 1 | -1/+26 |
| | |||||
* | Integrate internal changes | Bo Yang | 2016-10-10 | 1 | -15/+30 |
| | |||||
* | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 | 1 | -0/+4 |
| | | | | This includes all internal changes from around May 20 to now. | ||||
* | Down integrate from Google internal. | Jisi Liu | 2016-04-28 | 1 | -4/+30 |
| | |||||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-04-01 | 1 | -0/+59 |
|\ | |||||
| * | Added an API to allow oversize protos when using C++ extension in Python | Manjunath Kudlur | 2016-03-31 | 1 | -0/+59 |
| | | |||||
* | | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 1 | -33/+20 |
|/ | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 1 | -15/+66 |
| | |||||
* | Revert back changes to import unittest2 for py26 | Jisi Liu | 2015-10-05 | 1 | -1/+4 |
| | |||||
* | Down-integrate from google internal. | Jisi Liu | 2015-10-05 | 1 | -12/+8 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-25 | 1 | -27/+31 |
|\ | |||||
| * | Use assertIsInstance | Tamir Duberstein | 2015-08-22 | 1 | -11/+8 |
| | | |||||
| * | Get Python 2.6 working. | Dan O'Reilly | 2015-08-14 | 1 | -9/+12 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Fix some more Python 3 compat issues | Dan O'Reilly | 2015-08-14 | 1 | -10/+15 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Merge remote-tracking branch 'upstream/master' into py2_py3_straddle | Dan O'Reilly | 2015-08-12 | 1 | -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 Seaver | 2015-01-13 | 1 | -9/+9 |
| | | | |||||
| * | | Drop dependency on 'google.apputils'. | Tres Seaver | 2015-01-13 | 1 | -4/+4 |
| | | | | | | | | | | | | Use stdlib's 'unittest' instead. | ||||
* | | | Down-integrate from google3. | Feng Xiao | 2015-08-22 | 1 | -0/+115 |
| |/ |/| | |||||
* | | down-integrate internal changes | Bo Yang | 2015-05-21 | 1 | -25/+496 |
| | | |||||
* | | Don't hard-code the python path | Tamir Duberstein | 2015-05-06 | 1 | -1/+1 |
| | | |||||
* | | [PYTHON] Drop dependency on 'google.apputils'. | Tamir Duberstein | 2015-04-10 | 1 | -6/+5 |
| | | | | | | | | Use stdlib's 'unittest' instead. | ||||
* | | Down integrate from Google internal branch for C++ and Java. | Jisi Liu | 2015-02-28 | 1 | -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 Haberman | 2015-02-25 | 1 | -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 Liu | 2015-02-25 | 1 | -181/+601 |
|/ | | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145 | ||||
* | Down-integrate from internal code base. | Feng Xiao | 2014-11-10 | 1 | -0/+40 |
| | |||||
* | Down-integrate from internal branch. | Feng Xiao | 2014-10-07 | 1 | -1/+6 |
| | |||||
* | Replace links to code.google.com/protobuf with ↵ | Feng Xiao | 2014-10-01 | 1 | -1/+1 |
| | | | | developers.google.com/protocol-buffers | ||||
* | down integrate python opensource to svn | jieluo@google.com | 2014-08-12 | 1 | -46/+228 |
| | |||||
* | Down-integrate from internal branch | xiaofeng@google.com | 2012-09-22 | 1 | -15/+166 |
| | |||||
* | Submit recent changes from internal branch. See CHANGES.txt for more details. | liujisi@google.com | 2010-11-02 | 1 | -0/+254 |
| | |||||
* | Massive roll-up of changes. See CHANGES.txt. | kenton@google.com | 2009-12-18 | 1 | -3/+39 |
| | |||||
* | Submit recent changes from internal branch, including "lite mode" for | kenton@google.com | 2009-07-29 | 1 | -0/+53 |
C++ and Java. See CHANGES.txt for more details. |