Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Test under tox: Python 2.6, 2.7, 3.3, 3.4. | Tres Seaver | 2015-01-13 | 1 | -0/+13 |
| | |||||
* | Ignore more derived files. | Tres Seaver | 2015-01-13 | 1 | -1/+2 |
| | |||||
* | Merge branch 'ignore_so_libs' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | 1 | -0/+1 |
|\ | |||||
| * | Ignore .so files. | Tres Seaver | 2015-01-13 | 1 | -0/+1 |
| | | |||||
* | | 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 |
| | | |||||
* | | Typo. | Tres Seaver | 2015-01-13 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'prep_for_py2_py3_straddle' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Conflicts: python/setup.py | ||||
| * | | Overlooked dependency. | Tres Seaver | 2015-01-13 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'drop-apputils-dependency' into straddle_py2_py3 | Tres Seaver | 2015-01-13 | 24 | -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 Seaver | 2015-01-13 | 22 | -96/+100 |
| |/ | | | | | | | Use stdlib's 'unittest' instead. | ||||
* / | Prepare for Python2-Python3 straddle. | Tres Seaver | 2015-01-13 | 15 | -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 #160 from zhangkun83/master | Feng Xiao | 2015-01-12 | 2 | -0/+88 |
|\ | | | | | Include names.h as java_names.h in the opensource tree | ||||
| * | Align backslash vertically | zhangkun83 | 2015-01-12 | 1 | -1/+1 |
| | | |||||
| * | Include names.h as java_names.h in the opensource tree | zhangkun83 | 2015-01-12 | 2 | -0/+88 |
|/ | |||||
* | Merge pull request #143 from Ivoz/patch-1 | Feng Xiao | 2014-12-22 | 1 | -2/+2 |
|\ | | | | | Update python version / setuptools instructions | ||||
| * | Update python version / setuptools instructions | Matt Iversen | 2014-12-17 | 1 | -2/+2 |
| | | | | | | | | | | Reflect the change that protobuf should now only be supporting 2.6+ (I'd guess note python 3.x+ when its supported in implementation) Refer to the Python Packaging User Guide for installing setuptools (and pip) instead of out of date telecommunity guide. | ||||
* | | Merge pull request #46 from adalq/version | Feng Xiao | 2014-12-20 | 1 | -0/+35 |
|\ \ | | | | | | | Add __version__ | ||||
| * | | Updated __version__ | Adal Chiriliuc | 2014-12-14 | 1 | -1/+1 |
| | | | |||||
| * | | Add __version__ | Adal Chiriliuc | 2014-10-10 | 1 | -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 Chiriliuc | 2014-10-10 | 2 | -35/+0 |
| | | | | | | | | | | | | This reverts commit 5337cf564f5eb43c1975d1cfd87b4efba9e6bf35. | ||||
| * | | Add __version__ | Adal Chiriliuc | 2014-10-10 | 2 | -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__" | ||||
* | | | Merge pull request #139 from c0nk/master | Feng Xiao | 2014-12-20 | 1 | -1/+2 |
|\ \ \ | |_|/ |/| | | Improved little endian byte order detection | ||||
| * | | Improved little endian byte order detection | Kal Conley | 2014-12-16 | 1 | -1/+2 |
|/ / | | | | | | | | | | | | | Including <sys/param.h> on Mac/iOS doesn't define __BYTE_ORDER so PROTOBUF_LITTLE_ENDIAN was never being defined. This commit adds a check for the __LITTLE_ENDIAN__ macro which is defined by clang and Apple gcc on little endian architectures. | ||||
* | | Merge pull request #136 from cfallin/ruby-proto3-only | Joshua Haberman | 2014-12-12 | 1 | -0/+8 |
|\ \ | | | | | | | Support Ruby code generation only for proto3. | ||||
| * | | Support Ruby code generation only for proto3. | Chris Fallin | 2014-12-12 | 1 | -0/+8 |
|/ / | |||||
* | | Add missing header files in src/Makefile.am | Feng Xiao | 2014-12-12 | 1 | -1/+3 |
| | | |||||
* | | Update ruby DIST_FILES. | Feng Xiao | 2014-12-12 | 1 | -9/+16 |
| | | |||||
* | | Adds Travis Cl support to test the code automatically. | Feng Xiao | 2014-12-12 | 2 | -0/+6 |
| | | |||||
* | | Merge pull request #134 from cfallin/master | Joshua Haberman | 2014-12-12 | 20 | -62/+17557 |
|\ \ | | | | | | | Update Ruby build setup to produce gems successfully. Include upb as a single .c / .h file. | ||||
| * | | Rename protobuf Ruby module to google/protobuf and rework its build | Chris Fallin | 2014-12-12 | 20 | -62/+17557 |
|/ / | | | | | | | | | | | system. The Ruby module build now uses an amalgamated distribution of upb, and successfully builds a Ruby gem called 'google-protobuf' with module 'google/protobuf'. | ||||
* | | Merge pull request #128 from krishnanm86/master | Feng Xiao | 2014-12-12 | 2 | -14/+14 |
|\ \ | | | | | | | Source code refactoring. Extracted common functionality in cpp_helpers.c... | ||||
| * | | Reverting the space at the end for both files changed | Krishna | 2014-12-12 | 2 | -2/+2 |
| | | | |||||
| * | | Reverting the space at the end | Krishna | 2014-12-12 | 1 | -1/+1 |
| | | | |||||
| * | | Returned print_indent and print_outdent back to printservicestub and ↵ | Krishna | 2014-12-12 | 1 | -5/+8 |
| | | | | | | | | | | | | printserviceclass in python generator | ||||
| * | | Reverted changes to cpp_helpers.cc and made code reviews to python_geenerator.cc | Krishna | 2014-12-11 | 3 | -22/+20 |
| | | | |||||
| * | | Fixed bugs | Krishna | 2014-12-10 | 3 | -5/+8 |
| | | | |||||
| * | | Source code refactoring. Extracted common functionality in cpp_helpers.cc ↵ | Krishna | 2014-12-10 | 2 | -26/+22 |
| | | | | | | | | | | | | and python/python_generator.cc | ||||
* | | | Merge pull request #113 from nsuke/oneof-c++11 | Feng Xiao | 2014-12-11 | 5 | -41/+40 |
|\ \ \ | | | | | | | | | Make C++ code generation of string oneof field compatible with C++11 | ||||
| * | | | Make C++ string oneof field compatible with C++11 | Nobuaki Sukegawa | 2014-12-03 | 2 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | string oneof field was generated into "const ArenaStringPtr" field inside "default_oneof_instance_" struct (of name "<class name>OneofInstance"). On the other hand, in C++11, const field of type with trivial default constructor causes enclosing type's implicit default constructor to be deleted. Since ArenaStringPtr has tirvial default constructor, this caused default constructor of "default_oneof_instance_" struct to be deleted, making the constructor call inside generated code invalid and fail to compile. | ||||
| * | | | Display element name in test error log | Nobuaki Sukegawa | 2014-12-03 | 1 | -2/+2 |
| | | | | |||||
| * | | | Make test code runnable with C++11 | Nobuaki Sukegawa | 2014-12-03 | 3 | -37/+37 |
| |/ / | | | | | | | | | | | | | Preprocessor token right after string literal without whitespace results in parse failure in C++11. | ||||
* | | | Describe how to get gtest source for Visual Studio users. | Feng Xiao | 2014-12-11 | 1 | -0/+7 |
| | | | |||||
* | | | Update gtest version to v1.7.0. | Feng Xiao | 2014-12-11 | 1 | -3/+5 |
| | | | |||||
* | | | Update version number to v3.0.0-pre | Feng Xiao | 2014-12-10 | 3 | -4/+4 |
| | | | |||||
* | | | Merge branch v3.0.0-alpha-1 into master. | Feng Xiao | 2014-12-10 | 45 | -275/+972 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: configure.ac | ||||
| * | | | Fix LIBPROTOBUF_PROTOBUF annotations for buliding protobuf as DLLs.v3.0.0-alpha-1 | Feng Xiao | 2014-12-09 | 8 | -18/+33 |
| | | | | |||||
| * | | | Remove map_field.cc from lite-runtime. | Feng Xiao | 2014-12-09 | 2 | -5/+1 |
| | | | |