aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google
Commit message (Collapse)AuthorAge
...
* make the python json test less strict on expected errors.Gravatar Jisi Liu2015-10-05
|
* Merge remote-tracking branch 'origin/master' into fix-authorGravatar Jisi Liu2015-10-05
|\
* | Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
| |
| * Fix Python 3.4 cpp implementationGravatar Dan O'Reilly2015-08-31
|/ | | | | | | | | | 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>
* Fixed assignment syntax error.Gravatar Josh Haberman2015-08-28
| | | | Change-Id: Ifef8a300258214aae8f6b8516fbc61b7335b5724
* Fix for https://github.com/google/protobuf/issues/758Gravatar Josh Haberman2015-08-28
| | | | Change-Id: I590b34b96c84a3ba6e094a0bd86f153147ade3d3
* Excludes a failing python cpp test case.Gravatar Feng Xiao2015-08-26
|
* Merge branch 'master' of github.com:google/protobuf into beta-1Gravatar Feng Xiao2015-08-26
|\
| * Merge pull request #728 from dano/py3_str_compatGravatar Joshua Haberman2015-08-26
| |\ | | | | | | Get all tests passing on Python3 (except Python3.4 cpp implementation)
* | | Update version number.Gravatar Feng Xiao2015-08-26
| | | | | | | | | | | | | | | 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-1Gravatar Feng Xiao2015-08-25
|\| |
* | | Down-integrate from internal code base.Gravatar Feng Xiao2015-08-23
| | |
* | | Down-integrate from google3.Gravatar Feng Xiao2015-08-22
| | |
| | * Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Gravatar Dan O'Reilly2015-08-22
| | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| | * Start work on getting text handled properly on PY3Gravatar Dan O'Reilly2015-08-22
| | |
| * | assertEquals is deprecatedGravatar Tamir Duberstein2015-08-22
| | |
| * | Use assertIsInstanceGravatar Tamir Duberstein2015-08-22
| | |
| * | Clean up exception syntaxGravatar Tamir Duberstein2015-08-22
| | |
| * | Remove Python 2.5 cruftGravatar Tamir Duberstein2015-08-22
| |/
* | Down-integrate from internal branch.Gravatar Jisi Liu2015-08-21
| | | | | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
| * Add some clarifying comments. Remove ez_setup.py.Gravatar Dan O'Reilly2015-08-20
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Fix --cpp_implementation test failure. Test both pure Python and cpp ↵Gravatar Dan O'Reilly2015-08-15
| | | | | | | | | | | | implementation in tox. Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Just always uses BytseIO in text_format for nowGravatar Dan O'Reilly2015-08-14
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Get Python 2.6 working.Gravatar Dan O'Reilly2015-08-14
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Fix usage of assertItemsEqual on Py3Gravatar Dan O'Reilly2015-08-14
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Fix some more Python 3 compat issuesGravatar Dan O'Reilly2015-08-14
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Fixing some long/int bugsGravatar Dan O'Reilly2015-08-14
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Fixing some testsGravatar Dan O'Reilly2015-08-13
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Merge remote-tracking branch 'upstream/master' into py2_py3_straddleGravatar Dan O'Reilly2015-08-12
| |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Internal local modifications.Gravatar Bo Yang2015-07-09
| |
* | Update version number to 3.0.0-alpha-4Gravatar Bo Yang2015-05-29
| |
* | Update version number to 3.0.0-alpha-3Gravatar teboring2015-05-23
| |
* | down-integrate internal changesGravatar Bo Yang2015-05-21
| |
* | WhitespaceGravatar Tamir Duberstein2015-05-06
| |
* | Don't hard-code the python pathGravatar Tamir Duberstein2015-05-06
| |
* | [PYTHON] Drop dependency on 'google.apputils'.Gravatar Tamir Duberstein2015-04-10
| | | | | | | | Use stdlib's 'unittest' instead.
* | [PYTHON] Remove awkward duplicate testsGravatar Tamir Duberstein2015-04-10
| | | | | | | | We already run all tests with and without `--cpp_implementation`
* | [PYTHON] Clarify API version commentGravatar Tamir Duberstein2015-04-10
| |
* | Remove useless file that doesn't loadGravatar Tamir Duberstein2015-04-08
| | | | | | | | This file was broken in ada6556.
* | Merge pull request #196 from Zex/masterGravatar Joshua Haberman2015-03-31
|\ \ | | | | | | Fix raise and except syntax issues for py3
* | | Fix python versions to comply with pep-0440.Gravatar Jisi Liu2015-03-04
| | | | | | | | | | | | Change-Id: Ifb4958e4f371b36f249faa466473f851697edb5c
* | | Merge remote-tracking branch 'github/alpha-2-fix'Gravatar Jisi Liu2015-03-04
|\ \ \ | | | | | | | | | | | | Change-Id: I4c5186b8451713fda38e60dc3f828da6196c7a5e
| * | | Fix python package version to alpha-2.Gravatar Jisi Liu2015-03-04
| | | | | | | | | | | | | | | | Change-Id: Iae16dcae833959681a5c8e98764e5d1071e6fdcf
* | | | Down integrate from Google internal branch for C++ and Java.Gravatar Jisi Liu2015-02-28
|/ / / | | | | | | | | | | | | | | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
* | | Fixes for Python/C++ implementation in open-source:Gravatar Josh Haberman2015-02-25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Rosy hack doesn't apply (that test should be removed for the open-source release). * Added our own copy of parameterized.py (the open-source version of Google Apputils doesn't contain it). * The C++ Descriptor object didn't implement extension_ranges. * Had to implement a hack around returning EncodeError, to work around the module-loading behavior of the test runner.
* | | Down integrate from Google internal.Gravatar Jisi Liu2015-02-25
| | | | | | | | | | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145
| * | fix raise syntax issues for py3,Gravatar zex2015-02-06
|/ / | | | | | | fix except syntax issue for py3
* | Delete unused files.Gravatar Feng Xiao2015-01-27
| |
| * Straddle Python 2.6, 2.7, 3.3, 3.4.Gravatar Tres Seaver2015-01-13
| |
| * Don't check in derived objects.Gravatar Tres Seaver2015-01-13
| |
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-01 18:50:11 +0000