aboutsummaryrefslogtreecommitdiffhomepage
path: root/python
Commit message (Expand)AuthorAge
* Merge from google internalGravatar Jisi Liu2017-10-18
* Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-11
|\
| * Bump version for minor releaseGravatar Jisi Liu2017-09-14
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
* | Merge pull request #2576 from cristicbz/py-strutilGravatar Feng Xiao2017-09-08
|\ \
* | | Drop python2.6Gravatar Jie Luo2017-08-22
* | | Add Python 3.5 3.6Gravatar Jie Luo2017-08-22
* | | Merge pull request #3529 from pherl/merge3.4.xGravatar Jisi Liu2017-08-21
|\ \ \
* | | | remove the parens from the cmp() lambda definition (#3526)Gravatar cclauss2017-08-21
| * | | Merge remote-tracking branch 'origin/3.4.x' into mergemasterGravatar Jisi Liu2017-08-18
|/| | | | | |/ | |/|
| * | Merge pull request #3504 from pherl/3.4.xGravatar Jisi Liu2017-08-18
| |\ \
* | | | Revert "Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)" (#3524)Gravatar Jie Luo2017-08-18
* | | | Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)Gravatar cclauss2017-08-18
* | | | Define cmp() for Python 3 (#3517)Gravatar cclauss2017-08-18
* | | | define long() for Python 3Gravatar cclauss2017-08-18
* | | | Old style exception --> new style exceptionGravatar cclauss2017-08-17
| | * | Prefer system distributed binaries/libraries.Gravatar Jisi Liu2017-08-16
| * | | clean upGravatar Jisi Liu2017-08-16
| * | | Update testpypi addresses.Gravatar Jisi Liu2017-08-16
| |/ /
* | | PY26 tests compatibilityGravatar Jie Luo2017-08-04
* | | Skip setUpClass which is newly added in python2.7 for python2.6Gravatar Jie Luo2017-08-04
| * | Merge from masterGravatar Jisi Liu2017-07-25
| * | Merge remote-tracking branch 'origin/3.4.x' into vbGravatar Jisi Liu2017-07-24
| |\ \
| | * | Add __bool__ as well as __nonzero__ for python3Gravatar Jie Luo2017-07-24
| * | | Update version number for 3.4.0Gravatar Jisi Liu2017-07-24
| | * | Use keys() instead of iterkeys() to be python3 compatbile.Gravatar Jie Luo2017-07-24
| |/ /
* | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChongGravatar Yilun Chong2017-07-24
|\ \ \
* \ \ \ Merge pull request #3179 from bjwatson/fix-duration-typoGravatar Feng Xiao2017-07-20
|\ \ \ \
* \ \ \ \ Merge pull request #3262 from snnn/masterGravatar Jie Luo2017-07-19
|\ \ \ \ \
| | | | * | Fix code to use values() insteadGravatar Jisi Liu2017-07-19
| | | | * | Use itmes() instead of itervalues() to be python3 compatbile.Gravatar Jisi Liu2017-07-19
* | | | | | Merge pull request #3375 from TeBoring/3.3.xGravatar Paul Yang2017-07-19
|\ \ \ \ \ \
| | | | | * \ Merge master into 3.4.xGravatar Jisi Liu2017-07-18
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | |
| | | | | * | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
| * | | | | | Merge 3.3.x into masterGravatar Bo Yang2017-07-18
| |\ \ \ \ \ \
* | | | | | | | Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance testGravatar Jie Luo2017-07-17
|/ / / / / / /
| | | | * | | Merge branch 'master' into ConformanceTestYilunChongGravatar Yilun Chong2017-06-30
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Add scripts to build python wheel for linux. (#2693)Gravatar Paul Yang2017-06-28
| | | | * | | add proto2 supported for cpp,python,nodejs,ruby,phpGravatar Yilun Chong2017-06-27
| |_|_|/ / / |/| | | | |
| | * | | | Fix a bazel build error on WindowsGravatar Changming Sun2017-06-22
| |/ / / / |/| | | |
| | * | | Fix typos in commentGravatar Brian J. Watson2017-06-21
| |/ / / |/| | |
| * | | Update version number to 3.3.2Gravatar Bo Yang2017-06-21
* | | | Fix Markdown formatting in README.Gravatar Misha Brukman2017-05-23
| |/ / |/| |
| * | Update version number to 3.3.1Gravatar Feng Xiao2017-05-08
|/ /
* | Fix python3 issue.Gravatar Feng Xiao2017-04-20
* | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Gravatar Jie Luo2017-04-10
* | Update version number and changelog for 3.3.0Gravatar Feng Xiao2017-04-05
* | Down-integrate from google3.Gravatar Feng Xiao2017-03-29
* | Merge pull request #2613 from aausch/fix_memory_leakGravatar Jisi Liu2017-03-06
|\ \
* | | Prefer the term "3-Clause BSD License" over "New BSD License"Gravatar Sebastian Schuberth2017-02-28