| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Updated version numbers to 3.6.1 | Adam Cozzette | 2018-07-27 | 1 | -1/+1 |
| | | |||||
| * | Update version number to 3.6.0 | Jisi Liu | 2018-05-14 | 1 | -1/+1 |
| | | |||||
| * | Add __init__.py files to compiler and util subpackages (#4117) | Thomas Hisch | 2018-04-09 | 2 | -0/+0 |
| | | | | | | | The compiler and util subpackages are created by the build_py class in setup.py. This has caused an issue in the protobuf package in conda-forge (https://github.com/conda-forge/protobuf-feedstock/issues/40), which is fixed by this commit. | ||||
| * | Merge branch (#4466) | Paul Yang | 2018-04-02 | 1 | -1/+1 |
| | | | | | | | | | * Fix setup.py for windows build. * Bump version number to 3.5.2 * Cat the test-suite.log on errors for presubits | ||||
| * | Removed unused variables in repeated_scalar_container.cc | Adam Cozzette | 2018-03-20 | 1 | -12/+0 |
| | | |||||
| * | Removed unused code pertaining to shared_ptr | Adam Cozzette | 2018-03-20 | 1 | -7/+0 |
| | | |||||
| * | Added pyext/thread_unsafe_shared_ptr.h | Adam Cozzette | 2018-03-20 | 1 | -0/+104 |
| | | |||||
| * | Removed unrecognized option from no_package.proto | Adam Cozzette | 2018-03-20 | 1 | -3/+1 |
| | | |||||
| * | Merge branch 'master' into down-integrate | Adam Cozzette | 2018-03-13 | 1 | -4/+9 |
| |\ | |||||
| | * | Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262) | Jie Luo | 2018-02-09 | 1 | -4/+9 |
| | | | | | | | | | * Cython's stack does not have .py file name. Only check filenames when end with .py for _CalledFromGeneratedFile() | ||||
| * | | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 | 25 | -403/+746 |
| |/ | |||||
| * | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 1 | -1/+1 |
| |\ | |||||
| | * | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #4030 from cyyber/master | Feng Xiao | 2017-12-20 | 2 | -13/+7 |
| |\ \ | | | | | | | Calling Keychecker before checking key in MessageMap | ||||
| | * | | Calling Keychecker before checking key in MessageMap | cyyber | 2017-12-15 | 2 | -13/+7 |
| | | | | |||||
| * | | | Fix python descriptor test. | Jisi Liu | 2017-12-14 | 1 | -0/+13 |
| |/ / | |||||
| * | | Merge branch 'master' into down-integrate | Adam Cozzette | 2017-12-01 | 2 | -2/+2 |
| |\ \ | |||||
| | * | | Merge branch '3.5.x' into 3.5.x-merge | Adam Cozzette | 2017-11-30 | 2 | -2/+11 |
| | |\| | |||||
| | | * | Update version for 3.5.0.post1 | Jisi Liu | 2017-11-22 | 1 | -1/+1 |
| | | | | |||||
| | | * | Add _file_desc_by_toplevel_extension back | Jie Luo | 2017-11-22 | 1 | -1/+10 |
| | | | | | | | | | | | | | | | | | | | Add _file_desc_by_toplevel_extension back for compatibility issue with 3.4.1. _file_desc_by_toplevel_extension is a temporary solution for FieldDescriptor.file. FieldDescriptor.file was added in code gen. However, we need to keep it for some time for compatibility reason (with 3.4.1 only). May try to remove it after 2 years. | ||||
| | | * | Update version number to 3.5.0 | Jisi Liu | 2017-11-02 | 1 | -1/+1 |
| | | | | |||||
| | * | | Fix a typo in WKT's test suite | Roman Nekhoroshev | 2017-11-02 | 1 | -1/+1 |
| | |/ | | | | | | | | | | | | | Hi! Sorry for bothering with such a minor thing, but I just noticed and fixed one annoying typo in WKT's test suite: `"accpets" -> "accepts"` Thanks! | ||||
| * / | Integrated internal changes from Google | Adam Cozzette | 2017-12-01 | 11 | -332/+462 |
| |/ | |||||
| * | Merge pull request #3770 from pherl/3.5-integrate | Jisi Liu | 2017-10-19 | 14 | -38/+195 |
| |\ | | | | | Integrate google internal changes for the up coming 3.5 release. | ||||
| | * | Merge from google internal | Jisi Liu | 2017-10-18 | 14 | -38/+195 |
| | | | |||||
| * | | Merge pull request #3736 from jleni/fix_rbpi | Jisi Liu | 2017-10-18 | 2 | -2/+2 |
| |\ \ | |/ |/| | Fix: Truncated Message due to "TypeError: unhashable type: 'bytearray'" | ||||
| | * | Converting to immutable hashable types | Juan Leni | 2017-10-11 | 2 | -2/+2 |
| | | | |||||
| * | | Merge remote-tracking branch 'origin/3.4.x' into master | Jisi Liu | 2017-10-11 | 1 | -1/+1 |
| |\ \ | |/ |/| | |||||
| | * | Bump version for minor release | Jisi Liu | 2017-09-14 | 1 | -1/+1 |
| | | | |||||
| * | | Integrated internal changes from Google | Adam Cozzette | 2017-09-14 | 23 | -409/+1315 |
| | | | |||||
| * | | Merge pull request #2576 from cristicbz/py-strutil | Feng Xiao | 2017-09-08 | 1 | -1/+11 |
| |\ \ | | | | | | | python: do not include internal 'strutil.h' header | ||||
| | * | | python: do not include internal 'strutil.h' header | Cristi Cobzarenco | 2017-01-28 | 1 | -1/+11 |
| | | | | |||||
| * | | | Merge pull request #3529 from pherl/merge3.4.x | Jisi Liu | 2017-08-21 | 27 | -204/+749 |
| |\ \ \ | | | | | | | | | Merge 3.4.x into master | ||||
| | * \ \ | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | Jisi Liu | 2017-08-18 | 27 | -204/+749 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | | * | | Merge from master | Jisi Liu | 2017-07-25 | 3 | -5/+11 |
| | | | | | |||||
| | | * | | Merge remote-tracking branch 'origin/3.4.x' into vb | Jisi Liu | 2017-07-24 | 2 | -1/+4 |
| | | |\ \ | |||||
| | | | * | | Add __bool__ as well as __nonzero__ for python3 | Jie Luo | 2017-07-24 | 1 | -0/+3 |
| | | | | | | |||||
| | | | * | | Use keys() instead of iterkeys() to be python3 compatbile. | Jie Luo | 2017-07-24 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Update version number for 3.4.0 | Jisi Liu | 2017-07-24 | 1 | -1/+1 |
| | | |/ / | |||||
| | | * | | Fix code to use values() instead | Jisi Liu | 2017-07-19 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Use itmes() instead of itervalues() to be python3 compatbile. | Jisi Liu | 2017-07-19 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 | 26 | -206/+748 |
| | | | | | |||||
| * | | | | remove the parens from the cmp() lambda definition (#3526) | cclauss | 2017-08-21 | 1 | -2/+2 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remove the parens from the cmp() lambda definition https://github.com/PythonCharmers/python-future/pull/298 * remove the parens from the cmp() lambda definition https://github.com/PythonCharmers/python-future/pull/298 | ||||
| * | | | Define cmp() for Python 3 (#3517) | cclauss | 2017-08-18 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Define cmp() for Python 3 http://python-future.org/compatible_idioms.html?highlight=cmp#cmp * Define cmp() for Python 3 http://python-future.org/compatible_idioms.html?highlight=cmp#cmp | ||||
| * | | | define long() for Python 3 | cclauss | 2017-08-18 | 1 | -5/+9 |
| | | | | |||||
| * | | | PY26 tests compatibility | Jie Luo | 2017-08-04 | 2 | -4/+12 |
| | | | | | | | | | | | | | | | | | | | | | | 1, Some tests in reflection_test PY26 raise TypeError but other versions raise ValueError for convert negative long to unsigned 2, Change compare exception type to compare exception str for testDuplicateExtensionNumber. Original code raise 'Double registration of Extensions' is not an instance of (<type 'exceptions.AssertionError'>, <type 'exceptions.ValueError'>) for PY26 cpp implementation t | ||||
| * | | | Skip setUpClass which is newly added in python2.7 for python2.6 | Jie Luo | 2017-08-04 | 1 | -2/+3 |
| | | | | |||||
| * | | | Merge pull request #3179 from bjwatson/fix-duration-typo | Feng Xiao | 2017-07-20 | 1 | -2/+2 |
| |\ \ \ | | | | | | | | | Fix typos in comment | ||||
| | * | | | Fix typos in comment | Brian J. Watson | 2017-06-21 | 1 | -2/+2 |
| | |/ / | |||||
| * | | | Merge pull request #3262 from snnn/master | Jie Luo | 2017-07-19 | 3 | -5/+11 |
| |\ \ \ | | | | | | | | | Make it compatible with python 3.6.1 | ||||
 |
index : protobuf | |
| Protocol Buffers - Google's data interchange format |
| aboutsummaryrefslogtreecommitdiff |