aboutsummaryrefslogtreecommitdiff
path: root/python/google
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate internal changes to github.Bo Yang2016-12-193-13/+12
* Updated descriptor_pool.py to be compatible with Python 3Adam Cozzette2016-11-221-1/+1
* Fixed descriptor_pool_test.py for Python 2.6Adam Cozzette2016-11-221-1/+1
* Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-171-0/+4
|\
| * Use -DPROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOSRichard Shin2016-10-191-0/+4
* | Integrated internal changes from GoogleAdam Cozzette2016-11-1719-320/+982
|/
* Fix python cpp.Bo Yang2016-10-104-13/+13
* Update version number.Feng Xiao2016-10-101-1/+1
* Fix python bugs for internal integration.Bo Yang2016-10-101-1/+1
* Bump version number to 3.1.0-alpha-1.Bo Yang2016-10-101-1/+1
* Integrate internal changesBo Yang2016-10-1033-619/+1303
* Merge remote-tracking branch 'origin/3.0.x' into mergeJisi Liu2016-09-141-1/+1
|\
| * Bump version number to 3.0.2Jisi Liu2016-09-021-1/+1
* | Fix to typo/oversight in python testsJonathon Love2016-09-021-1/+1
* | Typo: beffer -> bufferAdam Matan2016-08-031-1/+1
|/
* Bump version number for GAJisi Liu2016-07-251-1/+1
* Update version number to 3.0.0-beta-4Feng Xiao2016-07-131-1/+1
* Integrate from internal code base.Feng Xiao2016-07-1311-100/+82
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-032-4/+4
* Fixed string formatting in text_format.py to be Python2.6-compatibleAdam Cozzette2016-06-301-2/+2
* Integrated internal changes from GoogleAdam Cozzette2016-06-2920-872/+2007
* Make surrogate regex even more lenient.Josh Haberman2016-06-061-2/+2
* JSON surrogates Python: adjust regex for OSX error message.Josh Haberman2016-06-061-2/+2
* Added test for surrogates (valid and invalid).Josh Haberman2016-06-031-0/+21
* Surrogate checking is unpredictable, so always manually check.Josh Haberman2016-06-031-8/+6
* Fixed Python by updating failure lists and fixed a few broken tests.Josh Haberman2016-06-031-0/+10
* JSON format for Any message must print @type first, use OrderedDict instead o...Jie Luo2016-05-172-1/+22
* Update version numbers for beta3Jisi Liu2016-05-101-1/+1
* Fix using std::shared_ptrJisi Liu2016-05-055-5/+5
* Fix the std::string error introduced in integration.Jisi Liu2016-05-051-1/+1
* Down integrate from Google internal.Jisi Liu2016-04-2828-540/+927
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-012-11/+94
|\
| * Added an API to allow oversize protos when using C++ extension in PythonManjunath Kudlur2016-03-312-11/+94
* | Fix signed-compare warning.Jisi Liu2016-03-311-1/+1
* | revert unexpected change for py26Jisi Liu2016-03-311-1/+4
* | Fix json_format.py in py26Jisi Liu2016-03-311-2/+4
* | Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-301-1/+1
|\|
| * Update version to 3.0.0b2.post2Silviu Calinoiu2016-03-071-1/+1
* | Integrate google internal changes.Jisi Liu2016-03-3027-135/+216
|/
* Add a modified patch from craigcitro@ to handle namespace sharing.Silviu Calinoiu2016-02-183-1/+14
* Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it whenManjunath Kudlur2016-02-161-0/+9
* Manually down-integrate python JSON struct support from internal code base.CH Albach2016-01-294-25/+658
* Fixed Python 3.x C++ build, and updated conformance failure lists.Josh Haberman2016-01-151-1/+1
* Fixed compile for Python 3. There are still some crashes though.Josh Haberman2015-12-302-90/+151
* Add missing files to EXTRA_DIST.Feng Xiao2015-12-281-0/+0
* Fix Python 2.6 test failures.Feng Xiao2015-12-211-1/+5
* Update version numbers.Feng Xiao2015-12-211-1/+1
* Down-integrate from internal code base.Feng Xiao2015-12-1134-1807/+3563
* Bringing in internal::shared_ptr into google:protobuf namespace.Manjunath Kudlur2015-12-096-0/+12
* Updated for c++98 compatibilityManjunath Kudlur2015-12-076-5/+12