aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/json_format.py
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Feng Xiao2018-08-081-1/+1
* Update minimal Python version to 2.7 (#4207)Yuchen Xie2018-06-251-5/+1
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-8/+25
* Merge from google internalJisi Liu2017-10-181-0/+5
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-11/+43
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-2/+2
* Integrate internal changesBo Yang2016-10-101-13/+80
* Typo: beffer -> bufferAdam Matan2016-08-031-1/+1
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-378/+384
* 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-171-1/+6
* Fix json_format.py in py26Jisi Liu2016-03-311-2/+4
* Integrate google internal changes.Jisi Liu2016-03-301-4/+2
* Manually down-integrate python JSON struct support from internal code base.CH Albach2016-01-291-18/+196
* Down-integrate from internal code base.Feng Xiao2015-12-111-208/+61
* fix json_format for python2.6:Jie Luo2015-10-191-3/+16
* Down-integrate from google internal.Jisi Liu2015-10-051-0/+601