Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added an API to allow oversize protos when using C++ extension in Python | Manjunath Kudlur | 2016-03-31 | 2 | -11/+94 |
| | |||||
* | Update version to 3.0.0b2.post2 | Silviu Calinoiu | 2016-03-07 | 1 | -1/+1 |
| | |||||
* | Add a modified patch from craigcitro@ to handle namespace sharing. | Silviu Calinoiu | 2016-02-18 | 3 | -1/+14 |
| | |||||
* | Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it when | Manjunath Kudlur | 2016-02-16 | 1 | -0/+9 |
| | | | | | | --allow_oversize_protos=true is passed to bazel build. When this macro is set, SetTotalBytesLimit is called to remove the 64MB limit on binary protos when during ParseFromString. | ||||
* | Manually down-integrate python JSON struct support from internal code base. | CH Albach | 2016-01-29 | 4 | -25/+658 |
| | |||||
* | Fixed Python 3.x C++ build, and updated conformance failure lists. | Josh Haberman | 2016-01-15 | 1 | -1/+1 |
| | |||||
* | Fixed compile for Python 3. There are still some crashes though. | Josh Haberman | 2015-12-30 | 2 | -90/+151 |
| | |||||
* | Add missing files to EXTRA_DIST. | Feng Xiao | 2015-12-28 | 1 | -0/+0 |
| | | | | Also delete some unused files. | ||||
* | Fix Python 2.6 test failures. | Feng Xiao | 2015-12-21 | 1 | -1/+5 |
| | | | | Change-Id: Ia9e2795b1ff1abb30410ffb3ef96ba6f46dd99d0 | ||||
* | Update version numbers. | Feng Xiao | 2015-12-21 | 1 | -1/+1 |
| | | | | | Version number for beta languages is updated to v3.0.0-beta-2. Version number for alpha languages is updated to v3.0.0-alpha-5. | ||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 34 | -1807/+3563 |
| | |||||
* | Bringing in internal::shared_ptr into google:protobuf namespace. | Manjunath Kudlur | 2015-12-09 | 6 | -0/+12 |
| | | | | Fixes #1029 | ||||
* | Updated for c++98 compatibility | Manjunath Kudlur | 2015-12-07 | 6 | -5/+12 |
| | |||||
* | Enable fast cpp protos in the python interface. | Manjunath Kudlur | 2015-12-07 | 6 | -6/+12 |
| | |||||
* | Fixed compile errors after rebase. | Josh Haberman | 2015-10-28 | 1 | -3/+1 |
| | |||||
* | Removed all warnings from the Python/C++ build. | Josh Haberman | 2015-10-28 | 11 | -132/+124 |
| | | | | | | | | | | | Also made the Travis build ensure that no warnings are present. These builds were previously spewing many warnings, which was hiding warnings for important things like accidentally using C++11-only features. Change-Id: I56caeee9db48bc78756a3e8d7c14874630627037 | ||||
* | fix json_format for python2.6: | Jie Luo | 2015-10-19 | 2 | -7/+25 |
| | | | | | 1, objcect_pair_hook is not supported in python2.6, so duplicated key check is removed in 2.6 2, total_seconds is not suppoted in python2.6, changed to compute seconds directly | ||||
* | remove extra collection import | Jisi Liu | 2015-10-06 | 1 | -1/+0 |
| | |||||
* | Revert back changes to import unittest2 for py26 | Jisi Liu | 2015-10-05 | 16 | -26/+64 |
| | |||||
* | make the python json test less strict on expected errors. | Jisi Liu | 2015-10-05 | 1 | -5/+5 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into fix-author | Jisi Liu | 2015-10-05 | 5 | -78/+159 |
|\ | |||||
| * | Fix Python 3.4 cpp implementation | Dan O'Reilly | 2015-08-31 | 5 | -78/+159 |
| | | | | | | | | | | | | | | | | | | | | Fixes the ScalarMapContainer/MessageMapContainer implementations on Python 3.4, by dynamically allocating their PyTypeObjects using PyType_FromSpecWithBases, instead of statically allocating them. This is necessary because Python 3.4+ disallows statically allocating a class with a dynamically allocated parent. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
* | | Down-integrate from google internal. | Jisi Liu | 2015-10-05 | 38 | -209/+1667 |
|/ | |||||
* | Fixed assignment syntax error. | Josh Haberman | 2015-08-28 | 1 | -1/+1 |
| | | | | Change-Id: Ifef8a300258214aae8f6b8516fbc61b7335b5724 | ||||
* | Fix for https://github.com/google/protobuf/issues/758 | Josh Haberman | 2015-08-28 | 1 | -14/+17 |
| | | | | Change-Id: I590b34b96c84a3ba6e094a0bd86f153147ade3d3 | ||||
* | Excludes a failing python cpp test case. | Feng Xiao | 2015-08-26 | 1 | -0/+7 |
| | |||||
* | Merge branch 'master' of github.com:google/protobuf into beta-1 | Feng Xiao | 2015-08-26 | 2 | -8/+24 |
|\ | |||||
| * | Merge pull request #728 from dano/py3_str_compat | Joshua Haberman | 2015-08-26 | 2 | -8/+24 |
| |\ | | | | | | | Get all tests passing on Python3 (except Python3.4 cpp implementation) | ||||
| | * | Fix metaclass issue on Python 3. Get text handling tests passing on Python 3. | Dan O'Reilly | 2015-08-22 | 2 | -10/+6 |
| | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| | * | Start work on getting text handled properly on PY3 | Dan O'Reilly | 2015-08-22 | 1 | -7/+27 |
| | | | |||||
* | | | Update version number. | Feng Xiao | 2015-08-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other languages are updated to v3.0.0-alpha-4. | ||||
* | | | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-25 | 26 | -426/+386 |
|\| | | |||||
| * | | assertEquals is deprecated | Tamir Duberstein | 2015-08-22 | 1 | -4/+4 |
| | | | |||||
| * | | Use assertIsInstance | Tamir Duberstein | 2015-08-22 | 3 | -17/+13 |
| | | | |||||
| * | | Clean up exception syntax | Tamir Duberstein | 2015-08-22 | 1 | -2/+0 |
| | | | |||||
| * | | Remove Python 2.5 cruft | Tamir Duberstein | 2015-08-22 | 1 | -4/+2 |
| |/ | |||||
| * | Add some clarifying comments. Remove ez_setup.py. | Dan O'Reilly | 2015-08-20 | 1 | -0/+2 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Fix --cpp_implementation test failure. Test both pure Python and cpp ↵ | Dan O'Reilly | 2015-08-15 | 1 | -8/+8 |
| | | | | | | | | | | | | implementation in tox. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Just always uses BytseIO in text_format for now | Dan O'Reilly | 2015-08-14 | 1 | -4/+1 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Get Python 2.6 working. | Dan O'Reilly | 2015-08-14 | 16 | -68/+98 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Fix usage of assertItemsEqual on Py3 | Dan O'Reilly | 2015-08-14 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Fix some more Python 3 compat issues | Dan O'Reilly | 2015-08-14 | 3 | -14/+25 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Fixing some long/int bugs | Dan O'Reilly | 2015-08-14 | 4 | -12/+21 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Fixing some tests | Dan O'Reilly | 2015-08-13 | 3 | -7/+8 |
| | | | | | | | | 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 | 57 | -3128/+9062 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | 10 | -123/+123 |
| | | | |||||
| * | | Don't check in derived objects. | Tres Seaver | 2015-01-13 | 2 | -0/+0 |
| | | | |||||
| * | | Compatibility with Python2.6 unittest. | Tres Seaver | 2015-01-13 | 3 | -14/+35 |
| | | | |||||
| * | | Use 'io.BytesIO' rather than 'cStringIO.StringIO'. | Tres Seaver | 2015-01-13 | 2 | -3/+3 |
| | | | |||||
| * | | Typo. | Tres Seaver | 2015-01-13 | 1 | -1/+1 |
| | | |