aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/internal
Commit message (Expand)AuthorAge
* Update minimal Python version to 2.7 (#4207)Gravatar Yuchen Xie2018-06-25
* Removed unrecognized option from no_package.protoGravatar Adam Cozzette2018-03-20
* Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
* Merge pull request #4030 from cyyber/masterGravatar Feng Xiao2017-12-20
|\
| * Calling Keychecker before checking key in MessageMapGravatar cyyber2017-12-15
* | Fix python descriptor test.Gravatar Jisi Liu2017-12-14
|/
* Merge branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| * Fix a typo in WKT's test suiteGravatar Roman Nekhoroshev2017-11-02
|/
* Merge pull request #3770 from pherl/3.5-integrateGravatar Jisi Liu2017-10-19
|\
| * Merge from google internalGravatar Jisi Liu2017-10-18
* | Converting to immutable hashable typesGravatar Juan Leni2017-10-11
|/
* Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
* 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
|/|
* | Define cmp() for Python 3 (#3517)Gravatar cclauss2017-08-18
* | define long() for Python 3Gravatar cclauss2017-08-18
* | PY26 tests compatibilityGravatar Jie Luo2017-08-04
* | Skip setUpClass which is newly added in python2.7 for python2.6Gravatar Jie Luo2017-08-04
| * Add __bool__ as well as __nonzero__ for python3Gravatar Jie Luo2017-07-24
| * Use keys() instead of iterkeys() to be python3 compatbile.Gravatar Jie Luo2017-07-24
| * Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
|/
* cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Gravatar Jie Luo2017-04-10
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
* Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
* A few more cases for binary conformance tests. (#2500)Gravatar Joshua Haberman2017-01-06
* Fixed descriptor_pool_test.py for Python 2.6Gravatar Adam Cozzette2016-11-22
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
* Fix python cpp.Gravatar Bo Yang2016-10-10
* Fix python bugs for internal integration.Gravatar Bo Yang2016-10-10
* Integrate internal changesGravatar Bo Yang2016-10-10
* Fix to typo/oversight in python testsGravatar Jonathon Love2016-09-02
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
* Fix spelling in strings and commentsGravatar Otto Kekäläinen2016-07-03
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
* Make surrogate regex even more lenient.Gravatar Josh Haberman2016-06-06
* JSON surrogates Python: adjust regex for OSX error message.Gravatar Josh Haberman2016-06-06
* Added test for surrogates (valid and invalid).Gravatar Josh Haberman2016-06-03
* JSON format for Any message must print @type first, use OrderedDict instead o...Gravatar Jie Luo2016-05-17
* Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
* Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2016-04-01
|\
* | revert unexpected change for py26Gravatar Jisi Liu2016-03-31
| * Added an API to allow oversize protos when using C++ extension in PythonGravatar Manjunath Kudlur2016-03-31
* | Integrate google internal changes.Gravatar Jisi Liu2016-03-30
|/
* Manually down-integrate python JSON struct support from internal code base.Gravatar CH Albach2016-01-29
* Fix Python 2.6 test failures.Gravatar Feng Xiao2015-12-21
* Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
* fix json_format for python2.6:Gravatar Jie Luo2015-10-19
* remove extra collection importGravatar Jisi Liu2015-10-06