aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/internal
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-048-19/+173
* Disable surrogate check for ucs2 (#5039)Jie Luo2018-08-142-3/+10
* Down-integrate from google3.Feng Xiao2018-08-0816-203/+1238
* Update minimal Python version to 2.7 (#4207)Yuchen Xie2018-06-251-3/+0
* Removed unrecognized option from no_package.protoAdam Cozzette2018-03-201-3/+1
* Integrated internal changes from GoogleAdam Cozzette2018-03-139-53/+196
* 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-011-1/+1
|\
| * Fix a typo in WKT's test suiteRoman Nekhoroshev2017-11-021-1/+1
* | Integrated internal changes from GoogleAdam Cozzette2017-12-014-3/+84
|/
* Merge pull request #3770 from pherl/3.5-integrateJisi Liu2017-10-199-34/+156
|\
| * Merge from google internalJisi Liu2017-10-189-34/+156
* | Converting to immutable hashable typesJuan Leni2017-10-112-2/+2
|/
* Integrated internal changes from GoogleAdam Cozzette2017-09-1416-291/+1188
* Merge pull request #3529 from pherl/merge3.4.xJisi Liu2017-08-2112-115/+449
|\
| * Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu2017-08-1812-115/+449
| |\
| | * 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
| | * Merge from Google internal for 3.4 releaseJisi Liu2017-07-1812-115/+446
* | | 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
|/
* cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Jie Luo2017-04-101-0/+9
* Down-integrate from google3.Feng Xiao2017-03-299-8/+201
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-12/+7
* A few more cases for binary conformance tests. (#2500)Joshua Haberman2017-01-061-8/+8
* Fixed descriptor_pool_test.py for Python 2.6Adam Cozzette2016-11-221-1/+1
* Integrated internal changes from GoogleAdam Cozzette2016-11-179-74/+304
* Fix python cpp.Bo Yang2016-10-102-5/+12
* Fix python bugs for internal integration.Bo Yang2016-10-101-1/+1
* Integrate internal changesBo Yang2016-10-1014-125/+570
* Fix to typo/oversight in python testsJonathon Love2016-09-021-1/+1
* Integrate from internal code base.Feng Xiao2016-07-134-29/+30
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-031-1/+1
* Integrated internal changes from GoogleAdam Cozzette2016-06-297-233/+516
* 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
* JSON format for Any message must print @type first, use OrderedDict instead o...Jie Luo2016-05-171-0/+16
* Down integrate from Google internal.Jisi Liu2016-04-2813-69/+313
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-011-0/+59
|\
| * Added an API to allow oversize protos when using C++ extension in PythonManjunath Kudlur2016-03-311-0/+59
* | revert unexpected change for py26Jisi Liu2016-03-311-1/+4
* | Integrate google internal changes.Jisi Liu2016-03-3017-62/+87
|/
* Manually down-integrate python JSON struct support from internal code base.CH Albach2016-01-293-7/+462
* Fix Python 2.6 test failures.Feng Xiao2015-12-211-1/+5
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-12 18:00:36 +0000