aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/pyext/descriptor.cc
Commit message (Collapse)AuthorAge
* 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 from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
|
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|
* Integrate internal changesGravatar Bo Yang2016-10-10
|
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
| | | | This includes all internal changes from around May 20 to now.
* Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
|
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
|
* Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
|
* Removed all warnings from the Python/C++ build.Gravatar Josh Haberman2015-10-28
| | | | | | | | | | | Also made the Travis build ensure that no warnings are present. These builds were previously spewing many warnings, which was hiding warnings for important things like accidentally using C++11-only features. Change-Id: I56caeee9db48bc78756a3e8d7c14874630627037
* Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
|
* Down-integrate from internal code base.Gravatar Feng Xiao2015-08-23
|
* Down-integrate from google3.Gravatar Feng Xiao2015-08-22
|
* down-integrate internal changesGravatar Bo Yang2015-05-21
|
* Down integrate from Google internal branch for C++ and Java.Gravatar Jisi Liu2015-02-28
| | | | | | | | - Maps for C++ lite - C++ Arena optimizations. - Java Lite runtime code size optimization. Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
* Fixes for Python/C++ implementation in open-source:Gravatar Josh Haberman2015-02-25
| | | | | | | | | | | | | * Rosy hack doesn't apply (that test should be removed for the open-source release). * Added our own copy of parameterized.py (the open-source version of Google Apputils doesn't contain it). * The C++ Descriptor object didn't implement extension_ranges. * Had to implement a hack around returning EncodeError, to work around the module-loading behavior of the test runner.
* Down integrate from Google internal.Gravatar Jisi Liu2015-02-25
| | | | Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145
* Fix Python C++ implementation build issues:Gravatar Feng Xiao2014-11-25
| | | | | 1. Haven't included the include path for "config.h". 2. Use of C++11 auto keyword.
* Down-integrate from internal code base.Gravatar Feng Xiao2014-11-10
|
* Replace links to code.google.com/protobuf with ↵Gravatar Feng Xiao2014-10-01
| | | | developers.google.com/protocol-buffers
* down integrate python opensource to svnGravatar jieluo@google.com2014-08-12