aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/pyext
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-0410-39/+45
* Down-integrate proto2 namespace fix.Feng Xiao2018-08-132-8/+8
* Fix failing tests.Feng Xiao2018-08-099-22/+667
* Down-integrate from google3.Feng Xiao2018-08-0823-484/+732
* Add Python 3.7 compatibility (#4862)Ben Webb2018-07-125-6/+6
* Update message_module.cc (#4835)Thomas Colthurst2018-07-031-0/+9
* Introduce Proto C API; based on cl/198113115 by amauryfaThomas Colthurst2018-05-303-1/+45
* 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
* 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-1313-276/+394
|/
* Integrated internal changes from GoogleAdam Cozzette2017-12-013-317/+315
* Merge from google internalJisi Liu2017-10-182-1/+9
* Integrated internal changes from GoogleAdam Cozzette2017-09-145-107/+98
* 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 from masterJisi Liu2017-07-253-5/+11
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-186-24/+119
* | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Jie Luo2017-04-101-1/+1
* | Down-integrate from google3.Feng Xiao2017-03-297-83/+104
* | Merge 3.2.x branch into master (#2648)Paul Yang2017-01-312-1/+5
|/
* Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-171-0/+4
|\
| * Use -DPROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOSRichard Shin2016-10-191-0/+4
* | Integrated internal changes from GoogleAdam Cozzette2016-11-178-244/+577
|/
* Fix python cpp.Bo Yang2016-10-102-8/+1
* Integrate internal changesBo Yang2016-10-1012-375/+533
* Integrate from internal code base.Feng Xiao2016-07-135-15/+18
* Integrated internal changes from GoogleAdam Cozzette2016-06-299-79/+569
* Fix using std::shared_ptrJisi Liu2016-05-055-5/+5
* Fix the std::string error introduced in integration.Jisi Liu2016-05-051-1/+1
* Down integrate from Google internal.Jisi Liu2016-04-2811-92/+161
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-011-11/+35
|\
| * Added an API to allow oversize protos when using C++ extension in PythonManjunath Kudlur2016-03-311-11/+35
* | Fix signed-compare warning.Jisi Liu2016-03-311-1/+1
* | Integrate google internal changes.Jisi Liu2016-03-308-22/+37
|/
* Add a modified patch from craigcitro@ to handle namespace sharing.Silviu Calinoiu2016-02-181-0/+4
* Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it whenManjunath Kudlur2016-02-161-0/+9
* Fixed Python 3.x C++ build, and updated conformance failure lists.Josh Haberman2016-01-151-1/+1
* Fixed compile for Python 3. There are still some crashes though.Josh Haberman2015-12-302-90/+151
* Down-integrate from internal code base.Feng Xiao2015-12-1114-1439/+1498
* Bringing in internal::shared_ptr into google:protobuf namespace.Manjunath Kudlur2015-12-096-0/+12
* Updated for c++98 compatibilityManjunath Kudlur2015-12-076-5/+12
* Enable fast cpp protos in the python interface.Manjunath Kudlur2015-12-076-6/+12
* Fixed compile errors after rebase.Josh Haberman2015-10-281-3/+1
* Removed all warnings from the Python/C++ build.Josh Haberman2015-10-2811-132/+124
* Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-055-78/+159
|\