aboutsummaryrefslogtreecommitdiff
path: root/python/google
Commit message (Expand)AuthorAgeFilesLines
* Updated version numbers to 3.6.1Adam Cozzette2018-07-271-1/+1
* Update version number to 3.6.0Jisi Liu2018-05-141-1/+1
* 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
| |\ \ \ | | | |/ | | |/|
| | * | 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
|\ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-24 16:20:08 +0000