aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Dan O'Reilly2015-08-223-13/+9
| | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
* Start work on getting text handled properly on PY3Dan O'Reilly2015-08-221-7/+27
|
* Merge pull request #722 from dano/py2_py3_straddleJoshua Haberman2015-08-2231-728/+448
|\ | | | | Add tox, Python 2.6 compatibility, and many Python 3 compatibility fixes
| * Set DYLD_LIBRARY_PATH for OSXDan O'Reilly2015-08-211-0/+1
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Travis now only tests Python2.6 on Linux.Dan O'Reilly2015-08-211-6/+21
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Fix travis buildDan O'Reilly2015-08-202-0/+3
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Improve tox.ini, install py26 for travis.Dan O'Reilly2015-08-202-12/+24
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Remove debug codeDan O'Reilly2015-08-201-1/+0
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Install tox during travis build.Dan O'Reilly2015-08-201-0/+2
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Remove ez_setup.py from Makefile.amDan O'Reilly2015-08-201-1/+0
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Use tox in travis build. Tweak tox.iniDan O'Reilly2015-08-203-10/+6
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into ↵Dan O'Reilly2015-08-201-1/+0
| |\ | | | | | | | | | py2_py3_straddle
| | * Fix duplicate entry in .gitignoreDan O'Reilly2015-08-181-1/+0
| | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * | Add some clarifying comments. Remove ez_setup.py.Dan O'Reilly2015-08-204-345/+5
| |/ | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Make testing cpp implementation optionalDan O'Reilly2015-08-161-2/+1
| | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * Fix --cpp_implementation test failure. Test both pure Python and cpp ↵Dan O'Reilly2015-08-152-8/+9
| | | | | | | | | | | | 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>
| * Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-1410-244/+471
| |\
| * | Disable py3* in toxDan O'Reilly2015-08-141-1/+2
| | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * | Get Python 2.6 working.Dan O'Reilly2015-08-1417-69/+104
| | | | | | | | | | | | 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>
| * | Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-1411-125/+470
| |\ \
| * | | Build protobuf files in as part of tox runs.Dan O'Reilly2015-08-131-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * | | Fixing some testsDan O'Reilly2015-08-134-42/+30
| | | | | | | | | | | | | | | | Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
| * | | Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-12930-21697/+246414
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 Seaver2015-01-131-0/+4
| | | | |
| * | | | Merge branch 'python-update_setup' into straddle_py2_py3Tres Seaver2015-01-132-37/+32
| |\ \ \ \
| | * | | | Noramlize 'setup.py' to fit conventions:Tres Seaver2015-01-132-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_py3Tres Seaver2015-01-131-244/+292
| |\ \ \ \ \
| | * | | | | Update to new canonical 'ez_setup.py'.Tres Seaver2015-01-131-244/+292
| | |/ / / / | | | | | | | | | | | | | | | | | | Downloaded from https://bootstrap.pypa.io/ez_setup.py.
| * | | | | Test under tox: Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-131-0/+13
| | | | | |
| * | | | | Ignore more derived files.Tres Seaver2015-01-131-1/+2
| | | | | |
| * | | | | Merge branch 'ignore_so_libs' into straddle_py2_py3Tres Seaver2015-01-131-0/+1
| |\ \ \ \ \
| | * | | | | Ignore .so files.Tres Seaver2015-01-131-0/+1
| | |/ / / /
| * | | | | 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-134-21/+35
| | | | | |
| * | | | | Use 'io.BytesIO' rather than 'cStringIO.StringIO'.Tres Seaver2015-01-132-3/+3
| | | | | |
| * | | | | Typo.Tres Seaver2015-01-131-1/+1
| | | | | |
| * | | | | Merge branch 'prep_for_py2_py3_straddle' into straddle_py2_py3Tres Seaver2015-01-131-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: python/setup.py
| | * | | | | Overlooked dependency.Tres Seaver2015-01-131-1/+1
| | | | | | |
| * | | | | | Merge branch 'drop-apputils-dependency' into straddle_py2_py3Tres Seaver2015-01-1324-96/+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-1322-96/+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').
* | | | | Merge pull request #584 from haberman/cwarningsJoshua Haberman2015-08-217-249/+354
|\ \ \ \ \ | |_|_|_|/ |/| | | | Ruby: Conform to C89/C90 variable declaration rules.
| * | | | Return TypedData_Wrap_Struct directly.Josh Haberman2015-08-202-4/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I6cf77f01370204ad4bc7b345a040a9a3de1706a0
| * | | | Conform to C89/C90 variable declaration rules.Josh Haberman2015-07-107-247/+354
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While we are C99 in general, the Ruby build system for building C extensions enables several flags that throw warnings for C89/C90 variable ordering rules. To avoid spewing a million warnings (or trying to specifically override these warnings with command-line flags, which would be tricky and possibly fragile) we conform to Ruby's world of C89/C90. Change-Id: I0e03e62d95068dfdfde112df0fb16a248a2f32a0
* | | | | Merge pull request #720 from jtattermusch/csharp_fixesJon Skeet2015-08-144-150/+183
|\ \ \ \ \ | | | | | | | | | | | | C# fix for TypeInitializer exception.
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-24 15:03:57 +0000