Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix json_format.py in py26 | Jisi Liu | 2016-03-31 | 1 | -2/+4 |
| | |||||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-03-30 | 2 | -1/+2 |
|\ | |||||
| * | Merge pull request #1306 from silviulica/master | Joshua Haberman | 2016-03-07 | 1 | -1/+1 |
| |\ | | | | | | | Update version to 3.0.0b2.post2 | ||||
| | * | Update version to 3.0.0b2.post2 | Silviu Calinoiu | 2016-03-07 | 1 | -1/+1 |
| | | | |||||
| * | | Add back the namespace_packages arg in setup.py. | Craig Citro | 2016-03-05 | 1 | -0/+1 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves #1296. The problem: in the previous patch, we tweaked the __init__.py files to use namespaces, but no longer declared ourselves as a namespace package. The second half was unwise. Note that this only comes up when installing protobuf alongside another package that also installs into the google namespace; as of right now, the only PyPI package that does is googleapis-common-protos, though the GAE SDK also uses google.appengine. Installing either or both of those alongside this package now works. The case that still remains is the upgrade path, which is also what worried me in #713. It seems that if protobuf 2.6.1 is installed, there's no way to safely upgrade that to work with a newer protobuf. However, `pip uninstall` && `pip install` does the trick. | ||||
* / | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 27 | -135/+216 |
|/ | |||||
* | Add a modified patch from craigcitro@ to handle namespace sharing. | Silviu Calinoiu | 2016-02-18 | 4 | -2/+14 |
| | |||||
* | Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it when | Manjunath Kudlur | 2016-02-16 | 1 | -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 Albach | 2016-01-29 | 4 | -25/+658 |
| | |||||
* | Fixed Python 3.x C++ build, and updated conformance failure lists. | Josh Haberman | 2016-01-15 | 1 | -1/+1 |
| | |||||
* | Allow conformance test runner to tolerate crashes, and re-enable conformance ↵ | Josh Haberman | 2016-01-11 | 2 | -4/+6 |
| | | | | tests. | ||||
* | Fixed compile for Python 3. There are still some crashes though. | Josh Haberman | 2015-12-30 | 3 | -91/+152 |
| | |||||
* | Require six>=1.9 for Python. | Feng Xiao | 2015-12-29 | 2 | -2/+2 |
| | | | | | | | | | We use six sub-modules that aren't available in old versions. Not specifying this requirement in the setup will lead to much less readable runtime errors. It's particuarlly problematic for Mac OSX users because the system comes with an old six version 1.4.1 by default. [skip ci] | ||||
* | Add missing files to EXTRA_DIST. | Feng Xiao | 2015-12-28 | 2 | -2/+3 |
| | | | | Also delete some unused files. | ||||
* | Disable python conformnace tests as well. | Feng Xiao | 2015-12-21 | 1 | -2/+4 |
| | | | | | | The testee program crashes on some inputs. Change-Id: Iab27b80e29b7a56c5bd7cb4724531ecf9bb2823a | ||||
* | Fix Python 2.6 test failures. | Feng Xiao | 2015-12-21 | 1 | -1/+5 |
| | | | | Change-Id: Ia9e2795b1ff1abb30410ffb3ef96ba6f46dd99d0 | ||||
* | Update version numbers. | Feng Xiao | 2015-12-21 | 1 | -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 Xiao | 2015-12-11 | 35 | -1807/+3564 |
| | |||||
* | Bringing in internal::shared_ptr into google:protobuf namespace. | Manjunath Kudlur | 2015-12-09 | 6 | -0/+12 |
| | | | | Fixes #1029 | ||||
* | Updated for c++98 compatibility | Manjunath Kudlur | 2015-12-07 | 6 | -5/+12 |
| | |||||
* | Enable fast cpp protos in the python interface. | Manjunath Kudlur | 2015-12-07 | 6 | -6/+12 |
| | |||||
* | Added Python failure lists, and fixes to make sure failure propagates. | Josh Haberman | 2015-12-03 | 1 | -1/+2 |
| | |||||
* | Conformance test implementation for Python. | Josh Haberman | 2015-12-02 | 2 | -0/+9 |
| | |||||
* | Pass $CC environment variable through tox. | Josh Haberman | 2015-10-28 | 1 | -0/+1 |
| | |||||
* | Special-case Clang-only warning flags to Clang. | Josh Haberman | 2015-10-28 | 2 | -4/+4 |
| | |||||
* | Disable some more warnings to be warnings-free. | Josh Haberman | 2015-10-28 | 1 | -1/+2 |
| | |||||
* | Fixed compile errors after rebase. | Josh Haberman | 2015-10-28 | 1 | -3/+1 |
| | |||||
* | Removed all warnings from the Python/C++ build. | Josh Haberman | 2015-10-28 | 13 | -134/+133 |
| | | | | | | | | | | | 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 Luo | 2015-10-19 | 3 | -9/+26 |
| | | | | | 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 | ||||
* | add complete WKT for python. | Jisi Liu | 2015-10-06 | 1 | -4/+8 |
| | |||||
* | Generate well known types for python. | Jisi Liu | 2015-10-06 | 1 | -8/+6 |
| | |||||
* | remove extra collection import | Jisi Liu | 2015-10-06 | 1 | -1/+0 |
| | |||||
* | disable tests for python-cpp under py26 as well. | Jisi Liu | 2015-10-06 | 1 | -1/+1 |
| | |||||
* | disable py2.6 tests for json_format_test | Jisi Liu | 2015-10-05 | 1 | -1/+2 |
| | |||||
* | Revert back changes to import unittest2 for py26 | Jisi Liu | 2015-10-05 | 16 | -26/+64 |
| | |||||
* | make the python json test less strict on expected errors. | Jisi Liu | 2015-10-05 | 1 | -5/+5 |
| | |||||
* | Merge remote-tracking branch 'origin/master' into fix-author | Jisi Liu | 2015-10-05 | 6 | -80/+160 |
|\ | |||||
| * | Fix Python 3.4 cpp implementation | Dan O'Reilly | 2015-08-31 | 6 | -80/+160 |
| | | | | | | | | | | | | | | | | | | | | 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 Liu | 2015-10-05 | 39 | -209/+1676 |
|/ | |||||
* | Fixed assignment syntax error. | Josh Haberman | 2015-08-28 | 1 | -1/+1 |
| | | | | Change-Id: Ifef8a300258214aae8f6b8516fbc61b7335b5724 | ||||
* | Fix for https://github.com/google/protobuf/issues/758 | Josh Haberman | 2015-08-28 | 1 | -14/+17 |
| | | | | Change-Id: I590b34b96c84a3ba6e094a0bd86f153147ade3d3 | ||||
* | Excludes a failing python cpp test case. | Feng Xiao | 2015-08-26 | 1 | -0/+7 |
| | |||||
* | Merge branch 'master' of github.com:google/protobuf into beta-1 | Feng Xiao | 2015-08-26 | 3 | -11/+27 |
|\ | |||||
| * | Merge pull request #728 from dano/py3_str_compat | Joshua Haberman | 2015-08-26 | 3 | -11/+27 |
| |\ | | | | | | | 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'Reilly | 2015-08-22 | 3 | -13/+9 |
| | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| | * | Start work on getting text handled properly on PY3 | Dan O'Reilly | 2015-08-22 | 1 | -7/+27 |
| | | | |||||
* | | | Update version number. | Feng Xiao | 2015-08-26 | 1 | -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-1 | Feng Xiao | 2015-08-25 | 29 | -741/+432 |
|\| | | |||||
| * | | assertEquals is deprecated | Tamir Duberstein | 2015-08-22 | 1 | -4/+4 |
| | | | |||||
| * | | Use assertIsInstance | Tamir Duberstein | 2015-08-22 | 3 | -17/+13 |
| | | |