summaryrefslogtreecommitdiff
path: root/python/google
AgeCommit message (Expand)Author
2018-11-04Revert "Merge tag 'v3.0.1-javalite'"android-wear-8.0.0_r2Colin Cross
2016-07-03Fix spelling in strings and commentsOtto Kekäläinen
2016-06-30Fixed string formatting in text_format.py to be Python2.6-compatibleAdam Cozzette
2016-06-29Integrated internal changes from GoogleAdam Cozzette
2016-06-06Make surrogate regex even more lenient.Josh Haberman
2016-06-06JSON surrogates Python: adjust regex for OSX error message.Josh Haberman
2016-06-03Added test for surrogates (valid and invalid).Josh Haberman
2016-06-03Surrogate checking is unpredictable, so always manually check.Josh Haberman
2016-06-03Fixed Python by updating failure lists and fixed a few broken tests.Josh Haberman
2016-05-17JSON format for Any message must print @type first, use OrderedDict instead o...Jie Luo
2016-05-10Update version numbers for beta3Jisi Liu
2016-05-05Fix using std::shared_ptrJisi Liu
2016-05-05Fix the std::string error introduced in integration.Jisi Liu
2016-04-28Down integrate from Google internal.Jisi Liu
2016-04-01Merge branch 'master' of github.com:google/protobufJisi Liu
2016-03-31Fix signed-compare warning.Jisi Liu
2016-03-31revert unexpected change for py26Jisi Liu
2016-03-31Added an API to allow oversize protos when using C++ extension in PythonManjunath Kudlur
2016-03-31Fix json_format.py in py26Jisi Liu
2016-03-30Merge branch 'master' of github.com:google/protobufJisi Liu
2016-03-30Integrate google internal changes.Jisi Liu
2016-03-07Update version to 3.0.0b2.post2Silviu Calinoiu
2016-02-18Add a modified patch from craigcitro@ to handle namespace sharing.Silviu Calinoiu
2016-02-16Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it whenManjunath Kudlur
2016-01-29Manually down-integrate python JSON struct support from internal code base.CH Albach
2016-01-15Fixed Python 3.x C++ build, and updated conformance failure lists.Josh Haberman
2015-12-30Fixed compile for Python 3. There are still some crashes though.Josh Haberman
2015-12-28Add missing files to EXTRA_DIST.Feng Xiao
2015-12-21Fix Python 2.6 test failures.Feng Xiao
2015-12-21Update version numbers.Feng Xiao
2015-12-11Down-integrate from internal code base.Feng Xiao
2015-12-09Bringing in internal::shared_ptr into google:protobuf namespace.Manjunath Kudlur
2015-12-07Updated for c++98 compatibilityManjunath Kudlur
2015-12-07Enable fast cpp protos in the python interface.Manjunath Kudlur
2015-10-28Fixed compile errors after rebase.Josh Haberman
2015-10-28Removed all warnings from the Python/C++ build.Josh Haberman
2015-10-19fix json_format for python2.6:Jie Luo
2015-10-06remove extra collection importJisi Liu
2015-10-05Revert back changes to import unittest2 for py26Jisi Liu
2015-10-05make the python json test less strict on expected errors.Jisi Liu
2015-10-05Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu
2015-10-05Down-integrate from google internal.Jisi Liu
2015-08-31Fix Python 3.4 cpp implementationDan O'Reilly
2015-08-28Fixed assignment syntax error.Josh Haberman
2015-08-28Fix for https://github.com/google/protobuf/issues/758Josh Haberman
2015-08-26Excludes a failing python cpp test case.Feng Xiao
2015-08-26Merge branch 'master' of github.com:google/protobuf into beta-1Feng Xiao
2015-08-26Merge pull request #728 from dano/py3_str_compatJoshua Haberman
2015-08-26Update version number.Feng Xiao
2015-08-25Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao