aboutsummaryrefslogtreecommitdiff
path: root/python
Commit message (Expand)AuthorAgeFilesLines
* Update version numbers for beta3Jisi Liu2016-05-101-1/+1
* 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-2828-540/+927
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-014-28/+124
|\
| * Linking the cpp implementation extension statically with libprotobufManjunath Kudlur2016-04-012-17/+30
| * Added an API to allow oversize protos when using C++ extension in PythonManjunath Kudlur2016-03-312-11/+94
* | Disable sign-compare warning.Jisi Liu2016-03-311-1/+3
* | Fix signed-compare warning.Jisi Liu2016-03-311-1/+1
* | revert unexpected change for py26Jisi Liu2016-03-311-1/+4
* | Fix json_format.py in py26Jisi Liu2016-03-311-2/+4
* | Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-302-1/+2
|\|
| * Merge pull request #1306 from silviulica/masterJoshua Haberman2016-03-071-1/+1
| |\
| | * Update version to 3.0.0b2.post2Silviu Calinoiu2016-03-071-1/+1
| * | Add back the namespace_packages arg in setup.py.Craig Citro2016-03-051-0/+1
| |/
* / Integrate google internal changes.Jisi Liu2016-03-3027-135/+216
|/
* Add a modified patch from craigcitro@ to handle namespace sharing.Silviu Calinoiu2016-02-184-2/+14
* Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it whenManjunath Kudlur2016-02-161-0/+9
* Manually down-integrate python JSON struct support from internal code base.CH Albach2016-01-294-25/+658
* Fixed Python 3.x C++ build, and updated conformance failure lists.Josh Haberman2016-01-151-1/+1
* Allow conformance test runner to tolerate crashes, and re-enable conformance ...Josh Haberman2016-01-112-4/+6
* Fixed compile for Python 3. There are still some crashes though.Josh Haberman2015-12-303-91/+152
* Require six>=1.9 for Python.Feng Xiao2015-12-292-2/+2
* Add missing files to EXTRA_DIST.Feng Xiao2015-12-282-2/+3
* Disable python conformnace tests as well.Feng Xiao2015-12-211-2/+4
* Fix Python 2.6 test failures.Feng Xiao2015-12-211-1/+5
* Update version numbers.Feng Xiao2015-12-211-1/+1
* Down-integrate from internal code base.Feng Xiao2015-12-1135-1807/+3564
* 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
* Added Python failure lists, and fixes to make sure failure propagates.Josh Haberman2015-12-031-1/+2
* Conformance test implementation for Python.Josh Haberman2015-12-022-0/+9
* Pass $CC environment variable through tox.Josh Haberman2015-10-281-0/+1
* Special-case Clang-only warning flags to Clang.Josh Haberman2015-10-282-4/+4
* Disable some more warnings to be warnings-free.Josh Haberman2015-10-281-1/+2
* Fixed compile errors after rebase.Josh Haberman2015-10-281-3/+1
* Removed all warnings from the Python/C++ build.Josh Haberman2015-10-2813-134/+133
* fix json_format for python2.6:Jie Luo2015-10-193-9/+26
* add complete WKT for python.Jisi Liu2015-10-061-4/+8
* Generate well known types for python.Jisi Liu2015-10-061-8/+6
* remove extra collection importJisi Liu2015-10-061-1/+0
* disable tests for python-cpp under py26 as well.Jisi Liu2015-10-061-1/+1
* disable py2.6 tests for json_format_testJisi Liu2015-10-051-1/+2
* Revert back changes to import unittest2 for py26Jisi Liu2015-10-0516-26/+64
* make the python json test less strict on expected errors.Jisi Liu2015-10-051-5/+5
* Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-056-80/+160
|\
| * Fix Python 3.4 cpp implementationDan O'Reilly2015-08-316-80/+160
* | Down-integrate from google internal.Jisi Liu2015-10-0539-209/+1676
|/
* Fixed assignment syntax error.Josh Haberman2015-08-281-1/+1