aboutsummaryrefslogtreecommitdiff
path: root/python/google
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Merge from masterJisi Liu2017-07-253-5/+11
| | * | Merge remote-tracking branch 'origin/3.4.x' into vbJisi Liu2017-07-242-1/+4
| | |\ \
| | | * | Add __bool__ as well as __nonzero__ for python3Jie Luo2017-07-241-0/+3
| | | * | Use keys() instead of iterkeys() to be python3 compatbile.Jie Luo2017-07-241-1/+1
| | * | | Update version number for 3.4.0Jisi Liu2017-07-241-1/+1
| | |/ /
| | * | Fix code to use values() insteadJisi Liu2017-07-191-1/+1
| | * | Use itmes() instead of itervalues() to be python3 compatbile.Jisi Liu2017-07-191-1/+1
| | * | Merge from Google internal for 3.4 releaseJisi Liu2017-07-1826-206/+748
* | | | remove the parens from the cmp() lambda definition (#3526)cclauss2017-08-211-2/+2
|/ / /
* | | Define cmp() for Python 3 (#3517)cclauss2017-08-181-1/+5
* | | define long() for Python 3cclauss2017-08-181-5/+9
* | | PY26 tests compatibilityJie Luo2017-08-042-4/+12
* | | Skip setUpClass which is newly added in python2.7 for python2.6Jie Luo2017-08-041-2/+3
* | | Merge pull request #3179 from bjwatson/fix-duration-typoFeng Xiao2017-07-201-2/+2
|\ \ \
| * | | Fix typos in commentBrian J. Watson2017-06-211-2/+2
| |/ /
* | | Merge pull request #3262 from snnn/masterJie Luo2017-07-193-5/+11
|\ \ \
| * | | Fix a bazel build error on WindowsChangming Sun2017-06-223-5/+11
| |/ /
* | | Update version number to 3.3.2Bo Yang2017-06-211-1/+1
* | | Update version number to 3.3.1Feng Xiao2017-05-081-1/+1
|/ /
* | Fix python3 issue.Feng Xiao2017-04-201-1/+1
* | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Jie Luo2017-04-103-6/+41
* | Update version number and changelog for 3.3.0Feng Xiao2017-04-051-1/+1
* | Down-integrate from google3.Feng Xiao2017-03-2921-61/+440
* | Merge pull request #2613 from aausch/fix_memory_leakJisi Liu2017-03-061-1/+8
|\ \
| * | cache generated classes, optimization and quick workaround to memory leakAlex Ausch2017-01-301-1/+8
| |/
* / Merge 3.2.x branch into master (#2648)Paul Yang2017-01-314-14/+13
|/
* A few more cases for binary conformance tests. (#2500)Joshua Haberman2017-01-061-8/+8
* 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