aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google
Commit message (Collapse)AuthorAge
* Update message_module.cc (#4835)Gravatar Thomas Colthurst2018-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)Gravatar Thomas Colthurst2018-06-29
| | | Internal convert file was broken. Change the capsule to the correct name
* Merge pull request #4827 from acozzette/merge-3-6-xGravatar Adam Cozzette2018-06-25
|\ | | | | Merge 3.6.x branch into master
* | Update minimal Python version to 2.7 (#4207)Gravatar Yuchen Xie2018-06-25
| |
| * Merge branch '3.6.x' into merge-3-6-xGravatar Adam Cozzette2018-06-25
|/|
* | Introduce Proto C API; based on cl/198113115 by amauryfaGravatar Thomas Colthurst2018-05-30
| |
| * Update version number to 3.6.0Gravatar Jisi Liu2018-05-14
|/
* Add __init__.py files to compiler and util subpackages (#4117)Gravatar Thomas Hisch2018-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)Gravatar Paul Yang2018-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.ccGravatar Adam Cozzette2018-03-20
|
* Removed unused code pertaining to shared_ptrGravatar Adam Cozzette2018-03-20
|
* Added pyext/thread_unsafe_shared_ptr.hGravatar Adam Cozzette2018-03-20
|
* Removed unrecognized option from no_package.protoGravatar Adam Cozzette2018-03-20
|
* Merge branch 'master' into down-integrateGravatar Adam Cozzette2018-03-13
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
| |
| * Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262)Gravatar Jie Luo2018-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 masterGravatar Jisi Liu2018-01-03
|\
* \ Merge pull request #4030 from cyyber/masterGravatar Feng Xiao2017-12-20
|\ \ | | | | | | Calling Keychecker before checking key in MessageMap
| | * Update version number to 3.5.1Gravatar Jisi Liu2017-12-19
| | |
| * | Calling Keychecker before checking key in MessageMapGravatar cyyber2017-12-15
| | |
* | | Fix python descriptor test.Gravatar Jisi Liu2017-12-14
|/ /
* | Merge branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
|\ \
* | | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| | |
| * | Merge branch '3.5.x' into 3.5.x-mergeGravatar Adam Cozzette2017-11-30
| |\|
| | * Update version for 3.5.0.post1Gravatar Jisi Liu2017-11-22
| | |
| | * Add _file_desc_by_toplevel_extension backGravatar Jie Luo2017-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.0Gravatar Jisi Liu2017-11-02
| |/ |/|
| * Fix a typo in WKT's test suiteGravatar Roman Nekhoroshev2017-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-integrateGravatar Jisi Liu2017-10-19
|\ | | | | Integrate google internal changes for the up coming 3.5 release.
* \ Merge pull request #3736 from jleni/fix_rbpiGravatar Jisi Liu2017-10-18
|\ \ | | | | | | Fix: Truncated Message due to "TypeError: unhashable type: 'bytearray'"
| | * Merge from google internalGravatar Jisi Liu2017-10-18
| |/ |/|
* | Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-11
|\ \
| | * Converting to immutable hashable typesGravatar Juan Leni2017-10-11
| |/ |/|
| * Bump version for minor releaseGravatar Jisi Liu2017-09-14
| |
* | Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
| |
* | Merge pull request #2576 from cristicbz/py-strutilGravatar Feng Xiao2017-09-08
|\ \ | | | | | | python: do not include internal 'strutil.h' header
* \ \ Merge pull request #3529 from pherl/merge3.4.xGravatar Jisi Liu2017-08-21
|\ \ \ | | | | | | | | Merge 3.4.x into master
* | | | remove the parens from the cmp() lambda definition (#3526)Gravatar cclauss2017-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 mergemasterGravatar Jisi Liu2017-08-18
|/| | | | | |/ | |/|
* | | Define cmp() for Python 3 (#3517)Gravatar cclauss2017-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 3Gravatar cclauss2017-08-18
| | |
* | | PY26 tests compatibilityGravatar Jie Luo2017-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.6Gravatar Jie Luo2017-08-04
| | |
| * | Merge from masterGravatar Jisi Liu2017-07-25
| | |
| * | Merge remote-tracking branch 'origin/3.4.x' into vbGravatar Jisi Liu2017-07-24
| |\ \
| | * | Add __bool__ as well as __nonzero__ for python3Gravatar Jie Luo2017-07-24
| | | |
| * | | Update version number for 3.4.0Gravatar Jisi Liu2017-07-24
| | | |
| | * | Use keys() instead of iterkeys() to be python3 compatbile.Gravatar Jie Luo2017-07-24
| |/ /
* | | Merge pull request #3179 from bjwatson/fix-duration-typoGravatar Feng Xiao2017-07-20
|\ \ \ | | | | | | | | Fix typos in comment
* \ \ \ Merge pull request #3262 from snnn/masterGravatar Jie Luo2017-07-19
|\ \ \ \ | | | | | | | | | | Make it compatible with python 3.6.1
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-19 01:11:44 +0000