aboutsummaryrefslogtreecommitdiff
path: root/python/google
Commit message (Expand)AuthorAgeFilesLines
* Fixed Python extension compile.Josh Haberman2018-09-072-7/+7
* Removed obsolete hash_map header that was breaking the compile.Josh Haberman2018-09-071-1/+0
* Down-integrate from google3.Josh Haberman2018-09-0420-65/+232
* Disable surrogate check for ucs2 (#5039)Jie Luo2018-08-142-3/+10
* Down-integrate proto2 namespace fix.Feng Xiao2018-08-132-8/+8
* Fix failing tests.Feng Xiao2018-08-099-22/+667
* Merge master branch.Feng Xiao2018-08-081-1/+1
|\
| * Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-08-011-1/+1
| |\
| | * Updated version numbers to 3.6.1Adam Cozzette2018-07-271-1/+1
* | | Down-integrate from google3.Feng Xiao2018-08-0849-846/+2322
|/ /
* | Add Python 3.7 compatibility (#4862)Ben Webb2018-07-125-6/+6
* | Update message_module.cc (#4835)Thomas Colthurst2018-07-031-0/+9
* | Fix capsule name. (#4836)Thomas Colthurst2018-06-291-1/+1
* | Merge pull request #4827 from acozzette/merge-3-6-xAdam Cozzette2018-06-251-1/+1
|\ \
| * | Merge branch '3.6.x' into merge-3-6-xAdam Cozzette2018-06-251-1/+1
| |\|
| | * Update version number to 3.6.0Jisi Liu2018-05-141-1/+1
* | | Update minimal Python version to 2.7 (#4207)Yuchen Xie2018-06-252-8/+1
|/ /
* / Introduce Proto C API; based on cl/198113115 by amauryfaThomas Colthurst2018-05-304-1/+137
|/
* Add __init__.py files to compiler and util subpackages (#4117)Thomas Hisch2018-04-092-0/+0
* Merge branch (#4466)Paul Yang2018-04-021-1/+1
* Removed unused variables in repeated_scalar_container.ccAdam Cozzette2018-03-201-12/+0
* Removed unused code pertaining to shared_ptrAdam Cozzette2018-03-201-7/+0
* Added pyext/thread_unsafe_shared_ptr.hAdam Cozzette2018-03-201-0/+104
* Removed unrecognized option from no_package.protoAdam Cozzette2018-03-201-3/+1
* Merge branch 'master' into down-integrateAdam Cozzette2018-03-131-4/+9
|\
| * Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262)Jie Luo2018-02-091-4/+9
* | Integrated internal changes from GoogleAdam Cozzette2018-03-1325-403/+746
|/
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-1/+1
|\
| * Update version number to 3.5.1Jisi Liu2017-12-191-1/+1
* | Merge pull request #4030 from cyyber/masterFeng Xiao2017-12-202-13/+7
|\ \
| * | Calling Keychecker before checking key in MessageMapcyyber2017-12-152-13/+7
* | | Fix python descriptor test.Jisi Liu2017-12-141-0/+13
|/ /
* | Merge branch 'master' into down-integrateAdam Cozzette2017-12-012-2/+2
|\ \
| * | Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette2017-11-302-2/+11
| |\|
| | * Update version for 3.5.0.post1Jisi Liu2017-11-221-1/+1
| | * Add _file_desc_by_toplevel_extension backJie Luo2017-11-221-1/+10
| | * Update version number to 3.5.0Jisi Liu2017-11-021-1/+1
| * | Fix a typo in WKT's test suiteRoman Nekhoroshev2017-11-021-1/+1
| |/
* / Integrated internal changes from GoogleAdam Cozzette2017-12-0111-332/+462
|/
* Merge pull request #3770 from pherl/3.5-integrateJisi Liu2017-10-1914-38/+195
|\
| * Merge from google internalJisi Liu2017-10-1814-38/+195
* | Merge pull request #3736 from jleni/fix_rbpiJisi Liu2017-10-182-2/+2
|\ \ | |/ |/|
| * Converting to immutable hashable typesJuan Leni2017-10-112-2/+2
* | Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-111-1/+1
|\ \ | |/ |/|
| * Bump version for minor releaseJisi Liu2017-09-141-1/+1
* | Integrated internal changes from GoogleAdam Cozzette2017-09-1423-409/+1315
* | Merge pull request #2576 from cristicbz/py-strutilFeng Xiao2017-09-081-1/+11
|\ \
| * | python: do not include internal 'strutil.h' headerCristi Cobzarenco2017-01-281-1/+11
* | | Merge pull request #3529 from pherl/merge3.4.xJisi Liu2017-08-2127-204/+749
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-1827-204/+749
| |\ \ \ | | | |/ | | |/|
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-08 11:40:14 +0000