aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/text_format.py
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-6/+9
* Down-integrate from google3.Feng Xiao2018-08-081-46/+88
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-37/+51
* Integrated internal changes from GoogleAdam Cozzette2017-12-011-1/+1
* Merge from google internalJisi Liu2017-10-181-1/+14
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-27/+80
* Down-integrate from google3.Feng Xiao2017-03-291-5/+30
* Integrate internal changesBo Yang2016-10-101-9/+7
* Fixed string formatting in text_format.py to be Python2.6-compatibleAdam Cozzette2016-06-301-2/+2
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-171/+442
* Down integrate from Google internal.Jisi Liu2016-04-281-376/+440
* Integrate google internal changes.Jisi Liu2016-03-301-47/+90
* Down-integrate from internal code base.Feng Xiao2015-12-111-47/+217
* Down-integrate from google internal.Jisi Liu2015-10-051-2/+10
* Merge branch 'master' of github.com:google/protobuf into beta-1Feng Xiao2015-08-261-6/+21
|\
| * Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Dan O'Reilly2015-08-221-8/+3
| * Start work on getting text handled properly on PY3Dan O'Reilly2015-08-221-7/+27
* | Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-251-20/+25
|\|
| * Just always uses BytseIO in text_format for nowDan O'Reilly2015-08-141-4/+1
| * Fix some more Python 3 compat issuesDan O'Reilly2015-08-141-3/+9
| * Fixing some long/int bugsDan O'Reilly2015-08-141-1/+4
| * Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-121-3/+38
| |\
| * | Use 'io.BytesIO' rather than 'cStringIO.StringIO'.Tres Seaver2015-01-131-2/+2
| * | Prepare for Python2-Python3 straddle.Tres Seaver2015-01-131-17/+16
* | | Down-integrate from google3.Feng Xiao2015-08-221-1/+1
| |/ |/|
* | down-integrate internal changesBo Yang2015-05-211-3/+33
* | Down integrate from Google internal.Jisi Liu2015-02-251-0/+5
|/
* Down-integrate from internal code base.Feng Xiao2014-11-201-1/+1
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-141-18/+18
* Down-integrate from internal code base.Feng Xiao2014-11-101-1/+7
* Replace links to code.google.com/protobuf with developers.google.com/protocol...Feng Xiao2014-10-011-1/+1
* down integrate python opensource to svnjieluo@google.com2014-08-121-94/+228
* Down-integrate from internal branchxiaofeng@google.com2013-02-251-2/+7
* Down-integrate from internal branchxiaofeng@google.com2012-09-221-107/+150
* Add new files for vcprojs, fix issues: 165, 211, 228, 240liujisi@google.com2010-12-071-1/+1
* Submit recent changes from internal branch. See CHANGES.txt for more details.liujisi@google.com2010-11-021-37/+55
* Address comments from various code reviews.kenton@google.com2010-01-071-3/+9
* Actually, that last revision can be simpler -- we don't need to parse strings...kenton@google.com2009-12-231-1/+1
* In Python, avoid relying on float('inf') and float('nan') as these don't work...kenton@google.com2009-12-231-3/+9
* Same as r275 except for Python.kenton@google.com2009-12-231-1/+7
* Massive roll-up of changes. See CHANGES.txt.kenton@google.com2009-12-181-0/+5
* Submit recent changes from internal branch, including "lite mode" forkenton@google.com2009-07-291-1/+526
* Integrate changes from internal Google-internal branch.kenton@google.com2008-09-241-10/+24
* Initial checkin.temporal2008-07-101-0/+111