aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/json_format.py
Commit message (Collapse)AuthorAge
* Update minimal Python version to 2.7 (#4207)Gravatar Yuchen Xie2018-06-25
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
|
* Merge from google internalGravatar Jisi Liu2017-10-18
|
* Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
|
* Integrate internal changesGravatar Bo Yang2016-10-10
|
* Typo: beffer -> bufferGravatar Adam Matan2016-08-03
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
| | | | This includes all internal changes from around May 20 to now.
* Surrogate checking is unpredictable, so always manually check.Gravatar Josh Haberman2016-06-03
|
* Fixed Python by updating failure lists and fixed a few broken tests.Gravatar Josh Haberman2016-06-03
| | | | | 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 ↵Gravatar Jie Luo2016-05-17
| | | | of {}
* Fix json_format.py in py26Gravatar Jisi Liu2016-03-31
|
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
|
* Manually down-integrate python JSON struct support from internal code base.Gravatar CH Albach2016-01-29
|
* Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
|
* fix json_format for python2.6:Gravatar Jie Luo2015-10-19
| | | | | 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
* Down-integrate from google internal.Gravatar Jisi Liu2015-10-05