Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Update message_module.cc (#4835) | 2018-07-03 | |
| | | | | | | | | * Update message_module.cc Add missing piece from pull request #4698: actually initialize the new API object. * Update message_module.cc | ||
* | Fix capsule name. (#4836) | 2018-06-29 | |
| | | | Internal convert file was broken. Change the capsule to the correct name | ||
* | Merge pull request #4827 from acozzette/merge-3-6-x | 2018-06-25 | |
|\ | | | | | Merge 3.6.x branch into master | ||
* | | Update minimal Python version to 2.7 (#4207) | 2018-06-25 | |
| | | |||
| * | Merge branch '3.6.x' into merge-3-6-x | 2018-06-25 | |
|/| | |||
* | | Introduce Proto C API; based on cl/198113115 by amauryfa | 2018-05-30 | |
| | | |||
| * | Update version number to 3.6.0 | 2018-05-14 | |
|/ | |||
* | Add __init__.py files to compiler and util subpackages (#4117) | 2018-04-09 | |
| | | | | | | 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) | 2018-04-02 | |
| | | | | | | | | * 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 | 2018-03-20 | |
| | |||
* | Removed unused code pertaining to shared_ptr | 2018-03-20 | |
| | |||
* | Added pyext/thread_unsafe_shared_ptr.h | 2018-03-20 | |
| | |||
* | Removed unrecognized option from no_package.proto | 2018-03-20 | |
| | |||
* | Merge branch 'master' into down-integrate | 2018-03-13 | |
|\ | |||
* | | Integrated internal changes from Google | 2018-03-13 | |
| | | |||
| * | Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262) | 2018-02-09 | |
|/ | | | | * Cython's stack does not have .py file name. Only check filenames when end with .py for _CalledFromGeneratedFile() | ||
* | Merge remote-tracking branch 'origin/3.5.x' into master | 2018-01-03 | |
|\ | |||
* \ | Merge pull request #4030 from cyyber/master | 2017-12-20 | |
|\ \ | | | | | | | Calling Keychecker before checking key in MessageMap | ||
| | * | Update version number to 3.5.1 | 2017-12-19 | |
| | | | |||
| * | | Calling Keychecker before checking key in MessageMap | 2017-12-15 | |
| | | | |||
* | | | Fix python descriptor test. | 2017-12-14 | |
|/ / | |||
* | | Merge branch 'master' into down-integrate | 2017-12-01 | |
|\ \ | |||
* | | | Integrated internal changes from Google | 2017-12-01 | |
| | | | |||
| * | | Merge branch '3.5.x' into 3.5.x-merge | 2017-11-30 | |
| |\| | |||
| | * | Update version for 3.5.0.post1 | 2017-11-22 | |
| | | | |||
| | * | Add _file_desc_by_toplevel_extension back | 2017-11-22 | |
| | | | | | | | | | | | | | | | | | | 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 | 2017-11-02 | |
| |/ |/| | |||
| * | Fix a typo in WKT's test suite | 2017-11-02 | |
|/ | | | | | | | 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! | ||
* | Merge pull request #3770 from pherl/3.5-integrate | 2017-10-19 | |
|\ | | | | | Integrate google internal changes for the up coming 3.5 release. | ||
* \ | Merge pull request #3736 from jleni/fix_rbpi | 2017-10-18 | |
|\ \ | | | | | | | Fix: Truncated Message due to "TypeError: unhashable type: 'bytearray'" | ||
| | * | Merge from google internal | 2017-10-18 | |
| |/ |/| | |||
* | | Merge remote-tracking branch 'origin/3.4.x' into master | 2017-10-11 | |
|\ \ | |||
| | * | Converting to immutable hashable types | 2017-10-11 | |
| |/ |/| | |||
| * | Bump version for minor release | 2017-09-14 | |
| | | |||
* | | Integrated internal changes from Google | 2017-09-14 | |
| | | |||
* | | Merge pull request #2576 from cristicbz/py-strutil | 2017-09-08 | |
|\ \ | | | | | | | python: do not include internal 'strutil.h' header | ||
* \ \ | Merge pull request #3529 from pherl/merge3.4.x | 2017-08-21 | |
|\ \ \ | | | | | | | | | Merge 3.4.x into master | ||
* | | | | remove the parens from the cmp() lambda definition (#3526) | 2017-08-21 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||
| * | | | Merge remote-tracking branch 'origin/3.4.x' into mergemaster | 2017-08-18 | |
|/| | | | | |/ | |/| | |||
* | | | Define cmp() for Python 3 (#3517) | 2017-08-18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | 2017-08-18 | |
| | | | |||
* | | | PY26 tests compatibility | 2017-08-04 | |
| | | | | | | | | | | | | | | | | | | | | | 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 | 2017-08-04 | |
| | | | |||
| * | | Merge from master | 2017-07-25 | |
| | | | |||
| * | | Merge remote-tracking branch 'origin/3.4.x' into vb | 2017-07-24 | |
| |\ \ | |||
| | * | | Add __bool__ as well as __nonzero__ for python3 | 2017-07-24 | |
| | | | | |||
| * | | | Update version number for 3.4.0 | 2017-07-24 | |
| | | | | |||
| | * | | Use keys() instead of iterkeys() to be python3 compatbile. | 2017-07-24 | |
| |/ / | |||
* | | | Merge pull request #3179 from bjwatson/fix-duration-typo | 2017-07-20 | |
|\ \ \ | | | | | | | | | Fix typos in comment | ||
* \ \ \ | Merge pull request #3262 from snnn/master | 2017-07-19 | |
|\ \ \ \ | | | | | | | | | | | Make it compatible with python 3.6.1 |