Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | | |||||
| * | | Clean up exception syntax | Tamir Duberstein | 2015-08-22 | 1 | -2/+0 |
| | | | |||||
| * | | Remove Python 2.5 cruft | Tamir Duberstein | 2015-08-22 | 1 | -4/+2 |
| |/ | |||||
| * | Set DYLD_LIBRARY_PATH for OSX | Dan O'Reilly | 2015-08-21 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Fix travis build | Dan O'Reilly | 2015-08-20 | 2 | -0/+3 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Improve tox.ini, install py26 for travis. | Dan O'Reilly | 2015-08-20 | 1 | -7/+10 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Remove debug code | Dan O'Reilly | 2015-08-20 | 1 | -1/+0 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Use tox in travis build. Tweak tox.ini | Dan O'Reilly | 2015-08-20 | 2 | -2/+4 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Add some clarifying comments. Remove ez_setup.py. | Dan O'Reilly | 2015-08-20 | 4 | -345/+5 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Make testing cpp implementation optional | Dan O'Reilly | 2015-08-16 | 1 | -2/+1 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Fix --cpp_implementation test failure. Test both pure Python and cpp ↵ | Dan O'Reilly | 2015-08-15 | 2 | -8/+9 |
| | | | | | | | | | | | | implementation in tox. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Just always uses BytseIO in text_format for now | Dan O'Reilly | 2015-08-14 | 1 | -4/+1 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Disable py3* in tox | Dan O'Reilly | 2015-08-14 | 1 | -1/+2 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Get Python 2.6 working. | Dan O'Reilly | 2015-08-14 | 17 | -69/+104 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Fix usage of assertItemsEqual on Py3 | Dan O'Reilly | 2015-08-14 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Fix some more Python 3 compat issues | Dan O'Reilly | 2015-08-14 | 3 | -14/+25 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Fixing some long/int bugs | Dan O'Reilly | 2015-08-14 | 4 | -12/+21 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Build protobuf files in as part of tox runs. | Dan O'Reilly | 2015-08-13 | 1 | -0/+1 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Fixing some tests | Dan O'Reilly | 2015-08-13 | 4 | -42/+30 |
| | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com> | ||||
| * | Merge remote-tracking branch 'upstream/master' into py2_py3_straddle | Dan O'Reilly | 2015-08-12 | 59 | -3198/+9181 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: python/google/protobuf/descriptor_pool.py python/google/protobuf/internal/api_implementation_default_test.py python/google/protobuf/internal/cpp_message.py python/google/protobuf/internal/descriptor_database_test.py python/google/protobuf/internal/descriptor_pool_test.py python/google/protobuf/internal/descriptor_python_test.py python/google/protobuf/internal/descriptor_test.py python/google/protobuf/internal/generator_test.py python/google/protobuf/internal/message_factory_python_test.py python/google/protobuf/internal/message_factory_test.py python/google/protobuf/internal/message_test.py python/google/protobuf/internal/proto_builder_test.py python/google/protobuf/internal/python_message.py python/google/protobuf/internal/reflection_test.py python/google/protobuf/internal/service_reflection_test.py python/google/protobuf/internal/symbol_database_test.py python/google/protobuf/internal/text_encoding_test.py python/google/protobuf/internal/text_format_test.py python/google/protobuf/internal/unknown_fields_test.py python/google/protobuf/internal/wire_format_test.py python/google/protobuf/pyext/descriptor_cpp2_test.py python/google/protobuf/pyext/message_factory_cpp2_test.py python/google/protobuf/pyext/reflection_cpp2_generated_test.py python/setup.py ruby/lib/google/protobuf/message_exts.rb | ||||
| * | | Declare explicit support for Python 3.3 and 3.4. | Tres Seaver | 2015-01-13 | 1 | -0/+4 |
| | | | |||||
| * | | Merge branch 'python-update_setup' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | 2 | -37/+32 |
| |\ \ | |||||
| | * | | Noramlize 'setup.py' to fit conventions: | Tres Seaver | 2015-01-13 | 2 | -37/+32 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move human-centric metadata to top of 'setup()' call. - Add Trove classifiers for supported Python versions. - Use 'find_packages()' + MANIFEST.in to avoid errors in listing modules and packages. | ||||
| * | | | Merge branch 'update-ez_setup' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | 1 | -244/+292 |
| |\ \ \ | |||||
| | * | | | Update to new canonical 'ez_setup.py'. | Tres Seaver | 2015-01-13 | 1 | -244/+292 |
| | |/ / | | | | | | | | | | | | | Downloaded from https://bootstrap.pypa.io/ez_setup.py. | ||||
| * | | | Test under tox: Python 2.6, 2.7, 3.3, 3.4. | Tres Seaver | 2015-01-13 | 1 | -0/+13 |
| | | | | |||||
| * | | | Straddle Python 2.6, 2.7, 3.3, 3.4. | Tres Seaver | 2015-01-13 | 10 | -123/+123 |
| | | | | |||||
| * | | | Don't check in derived objects. | Tres Seaver | 2015-01-13 | 2 | -0/+0 |
| | | | | |||||
| * | | | Compatibility with Python2.6 unittest. | Tres Seaver | 2015-01-13 | 4 | -21/+35 |
| | | | | |||||
| * | | | Use 'io.BytesIO' rather than 'cStringIO.StringIO'. | Tres Seaver | 2015-01-13 | 2 | -3/+3 |
| | | | |