aboutsummaryrefslogtreecommitdiff
path: root/python/google
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | OS X's version of Python has a slightly different error message for this error case.
* Added test for surrogates (valid and invalid).Josh Haberman2016-06-031-0/+21
|
* Surrogate checking is unpredictable, so always manually check.Josh Haberman2016-06-031-8/+6
|
* Fixed Python by updating failure lists and fixed a few broken tests.Josh Haberman2016-06-031-0/+10
| | | | | Python 2.x doesn't detect unpaired surrogates so we have to do that manually.
* JSON format for Any message must print @type first, use OrderedDict instead ↵Jie Luo2016-05-172-1/+22
| | | | of {}
* 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-012-11/+94
|\
| * Added an API to allow oversize protos when using C++ extension in PythonManjunath Kudlur2016-03-312-11/+94
| |
* | 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-301-1/+1
|\|
| * Update version to 3.0.0b2.post2Silviu Calinoiu2016-03-071-1/+1
| |
* | Integrate google internal changes.Jisi Liu2016-03-3027-135/+216
|/
* Add a modified patch from craigcitro@ to handle namespace sharing.Silviu Calinoiu2016-02-183-1/+14
|
* Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it whenManjunath Kudlur2016-02-161-0/+9
| | | | | | --allow_oversize_protos=true is passed to bazel build. When this macro is set, SetTotalBytesLimit is called to remove the 64MB limit on binary protos when during ParseFromString.
* 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
|
* Fixed compile for Python 3. There are still some crashes though.Josh Haberman2015-12-302-90/+151
|
* Add missing files to EXTRA_DIST.Feng Xiao2015-12-281-0/+0
| | | | Also delete some unused files.
* Fix Python 2.6 test failures.Feng Xiao2015-12-211-1/+5
| | | | Change-Id: Ia9e2795b1ff1abb30410ffb3ef96ba6f46dd99d0
* Update version numbers.Feng Xiao2015-12-211-1/+1
| | | | | Version number for beta languages is updated to v3.0.0-beta-2. Version number for alpha languages is updated to v3.0.0-alpha-5.
* Down-integrate from internal code base.Feng Xiao2015-12-1134-1807/+3563
|
* Bringing in internal::shared_ptr into google:protobuf namespace.Manjunath Kudlur2015-12-096-0/+12
| | | | Fixes #1029
* 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
| | | | | | | | | | | Also made the Travis build ensure that no warnings are present. These builds were previously spewing many warnings, which was hiding warnings for important things like accidentally using C++11-only features. Change-Id: I56caeee9db48bc78756a3e8d7c14874630627037
* fix json_format for python2.6:Jie Luo2015-10-192-7/+25
| | | | | 1, objcect_pair_hook is not supported in python2.6, so duplicated key check is removed in 2.6 2, total_seconds is not suppoted in python2.6, changed to compute seconds directly
* remove extra collection importJisi Liu2015-10-061-1/+0
|
* 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-055-78/+159
|\
| * Fix Python 3.4 cpp implementationDan O'Reilly2015-08-315-78/+159
| | | | | | | | | | | | | | | | | | | | Fixes the ScalarMapContainer/MessageMapContainer implementations on Python 3.4, by dynamically allocating their PyTypeObjects using PyType_FromSpecWithBases, instead of statically allocating them. This is necessary because Python 3.4+ disallows statically allocating a class with a dynamically allocated parent. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* | Down-integrate from google internal.Jisi Liu2015-10-0538-209/+1667
|/
* Fixed assignment syntax error.Josh Haberman2015-08-281-1/+1
| | | | Change-Id: Ifef8a300258214aae8f6b8516fbc61b7335b5724
* Fix for https://github.com/google/protobuf/issues/758Josh Haberman2015-08-281-14/+17
| | | | Change-Id: I590b34b96c84a3ba6e094a0bd86f153147ade3d3
* Excludes a failing python cpp test case.Feng Xiao2015-08-261-0/+7
|
* Merge branch 'master' of github.com:google/protobuf into beta-1Feng Xiao2015-08-262-8/+24
|\
| * Merge pull request #728 from dano/py3_str_compatJoshua Haberman2015-08-262-8/+24
| |\ | | | | | | Get all tests passing on Python3 (except Python3.4 cpp implementation)
| | * Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Dan O'Reilly2015-08-222-10/+6
| | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * Start work on getting text handled properly on PY3Dan O'Reilly2015-08-221-7/+27
| | |
* | | Update version number.Feng Xiao2015-08-261-1/+1
| | | | | | | | | | | | | | | Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other languages are updated to v3.0.0-alpha-4.
* | | Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-2526-426/+386
|\| |
| * | assertEquals is deprecatedTamir Duberstein2015-08-221-4/+4
| | |
| * | Use assertIsInstanceTamir Duberstein2015-08-223-17/+13
| | |