aboutsummaryrefslogtreecommitdiff
path: root/python/google
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | Clean up exception syntaxTamir Duberstein2015-08-221-2/+0
| | |
| * | Remove Python 2.5 cruftTamir Duberstein2015-08-221-4/+2
| |/
| * Add some clarifying comments. Remove ez_setup.py.Dan O'Reilly2015-08-201-0/+2
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Fix --cpp_implementation test failure. Test both pure Python and cpp ↵Dan O'Reilly2015-08-151-8/+8
| | | | | | | | | | | | implementation in tox. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Just always uses BytseIO in text_format for nowDan O'Reilly2015-08-141-4/+1
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Get Python 2.6 working.Dan O'Reilly2015-08-1416-68/+98
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Fix usage of assertItemsEqual on Py3Dan O'Reilly2015-08-141-2/+2
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Fix some more Python 3 compat issuesDan O'Reilly2015-08-143-14/+25
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Fixing some long/int bugsDan O'Reilly2015-08-144-12/+21
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Fixing some testsDan O'Reilly2015-08-133-7/+8
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-1257-3128/+9062
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Straddle Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-1310-123/+123
| | |
| * | Don't check in derived objects.Tres Seaver2015-01-132-0/+0
| | |
| * | Compatibility with Python2.6 unittest.Tres Seaver2015-01-133-14/+35
| | |
| * | Use 'io.BytesIO' rather than 'cStringIO.StringIO'.Tres Seaver2015-01-132-3/+3
| | |
| * | Typo.Tres Seaver2015-01-131-1/+1
| | |
| * | Merge branch 'drop-apputils-dependency' into straddle_py2_py3Tres Seaver2015-01-1323-91/+100
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: python/google/protobuf/internal/message_factory_test.py python/google/protobuf/internal/reflection_test.py python/google/protobuf/internal/text_format_test.py
| | * | Drop dependency on 'google.apputils'.Tres Seaver2015-01-1321-91/+100
| | | | | | | | | | | | | | | | Use stdlib's 'unittest' instead.
| * | | Prepare for Python2-Python3 straddle.Tres Seaver2015-01-1315-198/+144
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove PY25 cruft. - Selectively apply cleanups from 'python-modernize': - New exception syntax. - Use 'six' to handle module renames. - Use 'six' to handle text / binary stuff. This PR covers most of the work from #66 which falls inside `python` (rather than the Python code generation stuff in 'src').
* | | Down-integrate from internal code base.Feng Xiao2015-08-233-28/+99
| | |
* | | Down-integrate from google3.Feng Xiao2015-08-2223-665/+969
| | |
* | | Down-integrate from internal branch.Jisi Liu2015-08-212-0/+66
| |/ |/| | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
* | Internal local modifications.Bo Yang2015-07-091-0/+7
| |
* | Update version number to 3.0.0-alpha-4Bo Yang2015-05-291-1/+1
| |
* | Update version number to 3.0.0-alpha-3teboring2015-05-231-1/+1
| |
* | down-integrate internal changesBo Yang2015-05-2141-544/+3281
| |
* | WhitespaceTamir Duberstein2015-05-061-1/+1
| |
* | Don't hard-code the python pathTamir Duberstein2015-05-0615-15/+15
| |
* | [PYTHON] Drop dependency on 'google.apputils'.Tamir Duberstein2015-04-1015-89/+94
| | | | | | | | Use stdlib's 'unittest' instead.
* | [PYTHON] Remove awkward duplicate testsTamir Duberstein2015-04-103-162/+0
| | | | | | | | We already run all tests with and without `--cpp_implementation`
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 07:41:31 +0000