aboutsummaryrefslogtreecommitdiff
path: root/python/google
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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`
* | [PYTHON] Clarify API version commentTamir Duberstein2015-04-101-2/+2
| |
* | Remove useless file that doesn't loadTamir Duberstein2015-04-081-663/+0
| | | | | | | | This file was broken in ada6556.
* | Merge pull request #196 from Zex/masterJoshua Haberman2015-03-311-2/+2
|\ \ | | | | | | Fix raise and except syntax issues for py3
| * | fix raise syntax issues for py3,zex2015-02-061-2/+2
| | | | | | | | | | | | fix except syntax issue for py3
* | | Fix python versions to comply with pep-0440.Jisi Liu2015-03-041-1/+1
| | | | | | | | | | | | Change-Id: Ifb4958e4f371b36f249faa466473f851697edb5c
* | | Merge remote-tracking branch 'github/alpha-2-fix'Jisi Liu2015-03-041-1/+1
|\ \ \ | | | | | | | | | | | | Change-Id: I4c5186b8451713fda38e60dc3f828da6196c7a5e
| * | | Fix python package version to alpha-2.Jisi Liu2015-03-041-1/+1
| | | | | | | | | | | | | | | | Change-Id: Iae16dcae833959681a5c8e98764e5d1071e6fdcf
* | | | Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-286-15/+22
|/ / / | | | | | | | | | | | | | | | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
* | | Fixes for Python/C++ implementation in open-source:Josh Haberman2015-02-259-23/+484
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.Jisi Liu2015-02-2534-2057/+5683
|/ / | | | | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145
* / Delete unused files.Feng Xiao2015-01-271-27/+0
|/
* Merge pull request #46 from adalq/versionFeng Xiao2014-12-201-0/+35
|\ | | | | Add __version__
| * Updated __version__Adal Chiriliuc2014-12-141-1/+1
| |
| * Add __version__Adal Chiriliuc2014-10-101-0/+35
| | | | | | | | | | | | | | | | Added __version__ attr to package so that scripts that check local packages to see if newer versions are available can work. Almost all Python packages have a version attr, and the vast majority of them name it "__version__"
| * Revert "Add __version__"Adal Chiriliuc2014-10-102-35/+0
| | | | | | | | This reverts commit 5337cf564f5eb43c1975d1cfd87b4efba9e6bf35.
| * Add __version__Adal Chiriliuc2014-10-102-0/+35
| | | | | | | | | | | | | | | | Added __version__ attr to package so that scripts that check local packages to see if newer versions are available can work. Almost all Python packages have a version attr, and the vast majority of them name it "__version__"
* | Fix Python C++ implementation build issues:Feng Xiao2014-11-251-4/+8
| | | | | | | | | | 1. Haven't included the include path for "config.h". 2. Use of C++11 auto keyword.
* | Down-integrate from internal code base.Feng Xiao2014-11-201-1/+1
| |
* | Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-143-24/+20
| |
* | Merge branch 'typofixes-vlajos-20141108' of ↵Feng Xiao2014-11-115-5/+5
|\ \ | | | | | | | | | | | | | | | | | | https://github.com/vlajos/protobuf into typo Conflicts: src/google/protobuf/compiler/java/java_file.cc
| * | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-085-5/+5
| |/
* / Down-integrate from internal code base.Feng Xiao2014-11-1044-594/+1220
|/
* Down-integrate from internal branch.Feng Xiao2014-10-074-6/+22
|
* Replace links to code.google.com/protobuf with ↵Feng Xiao2014-10-0167-67/+67
| | | | developers.google.com/protocol-buffers
* merge tags/2.6.0 into trunkjieluo@google.com2014-08-252-22/+1
|
* make dist complains the file name is too long and refuse to put it to tar. ↵jieluo@google.com2014-08-141-1/+1
| | | | Change the file to a shorter name
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-25 01:18:47 +0000