Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix python cpp. | Bo Yang | 2016-09-23 | 4 | -13/+13 |
| | |||||
* | Update version number. | Feng Xiao | 2016-09-22 | 1 | -1/+1 |
| | | | | | | [skip ci] Change-Id: I1ba6f6372a08b5796570851336e1a548602f60da | ||||
* | Fix python bugs for internal integration. | Bo Yang | 2016-09-21 | 1 | -1/+1 |
| | |||||
* | Bump version number to 3.1.0-alpha-1. | Bo Yang | 2016-09-20 | 1 | -1/+1 |
| | |||||
* | Integrate internal changes | Bo Yang | 2016-09-19 | 33 | -619/+1303 |
| | |||||
* | Merge remote-tracking branch 'origin/3.0.x' into merge | Jisi Liu | 2016-09-14 | 1 | -1/+1 |
|\ | |||||
| * | Bump version number to 3.0.2 | Jisi Liu | 2016-09-02 | 1 | -1/+1 |
| | | |||||
* | | Fix to typo/oversight in python tests | Jonathon Love | 2016-09-02 | 1 | -1/+1 |
| | | | | | | | | Fix to typo/oversight in python tests, only affecting python 3 | ||||
* | | Typo: beffer -> buffer | Adam Matan | 2016-08-03 | 1 | -1/+1 |
|/ | |||||
* | Bump version number for GA | Jisi Liu | 2016-07-25 | 1 | -1/+1 |
| | |||||
* | Update version number to 3.0.0-beta-4 | Feng Xiao | 2016-07-13 | 1 | -1/+1 |
| | |||||
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 11 | -100/+82 |
| | |||||
* | Fix spelling in strings and comments | Otto Kekäläinen | 2016-07-03 | 2 | -4/+4 |
| | |||||
* | Fixed string formatting in text_format.py to be Python2.6-compatible | Adam Cozzette | 2016-06-30 | 1 | -2/+2 |
| | | | | | | In Python 2.6 the positional argument specifiers are apparently required to be explicitly specified: http://stackoverflow.com/questions/10054122/valueerror-zero-length-field-name-in-format-python | ||||
* | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 | 20 | -872/+2007 |
| | | | | This includes all internal changes from around May 20 to now. | ||||
* | Make surrogate regex even more lenient. | Josh Haberman | 2016-06-06 | 1 | -2/+2 |
| | |||||
* | JSON surrogates Python: adjust regex for OSX error message. | Josh Haberman | 2016-06-06 | 1 | -2/+2 |
| | | | | | OS X's version of Python has a slightly different error message for this error case. | ||||
* | Added test for surrogates (valid and invalid). | Josh Haberman | 2016-06-03 | 1 | -0/+21 |
| | |||||
* | Surrogate checking is unpredictable, so always manually check. | Josh Haberman | 2016-06-03 | 1 | -8/+6 |
| | |||||
* | Fixed Python by updating failure lists and fixed a few broken tests. | Josh Haberman | 2016-06-03 | 1 | -0/+10 |
| | | | | | Python 2.x doesn't detect unpaired surrogates so we have to do that manually. | ||||
* | JSON format for Any message must print @type first, use OrderedDict instead ↵ | Jie Luo | 2016-05-17 | 2 | -1/+22 |
| | | | | of {} | ||||
* | Update version numbers for beta3 | Jisi Liu | 2016-05-10 | 1 | -1/+1 |
| | |||||
* | Fix using std::shared_ptr | Jisi Liu | 2016-05-05 | 5 | -5/+5 |
| | |||||
* | Fix the std::string error introduced in integration. | Jisi Liu | 2016-05-05 | 1 | -1/+1 |
| | |||||
* | Down integrate from Google internal. | Jisi Liu | 2016-04-28 | 28 | -540/+927 |
| | |||||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-04-01 | 2 | -11/+94 |
|\ | |||||
| * | Added an API to allow oversize protos when using C++ extension in Python | Manjunath Kudlur | 2016-03-31 | 2 | -11/+94 |
| | | |||||
* | | Fix signed-compare warning. | Jisi Liu | 2016-03-31 | 1 | -1/+1 |
| | | |||||
* | | revert unexpected change for py26 | Jisi Liu | 2016-03-31 | 1 | -1/+4 |
| | | |||||
* | | Fix json_format.py in py26 | Jisi Liu | 2016-03-31 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-03-30 | 1 | -1/+1 |
|\| | |||||
| * | Update version to 3.0.0b2.post2 | Silviu Calinoiu | 2016-03-07 | 1 | -1/+1 |
| | | |||||
* | | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 27 | -135/+216 |
|/ | |||||
* | 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 |
| |