aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google
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 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
| | | * | Fix code to use values() insteadGravatar Jisi Liu2017-07-19
| | | | |
| | | * | Use itmes() instead of itervalues() to be python3 compatbile.Gravatar Jisi Liu2017-07-19
| | | | |
| | | * | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
| | | | |
| * | | | Fix a bazel build error on WindowsGravatar Changming Sun2017-06-22
| | |/ / | |/| |
| | * | Fix typos in commentGravatar Brian J. Watson2017-06-21
| |/ /
* | | Update version number to 3.3.2Gravatar Bo Yang2017-06-21
| | |
* | | Update version number to 3.3.1Gravatar Feng Xiao2017-05-08
|/ /
* | Fix python3 issue.Gravatar Feng Xiao2017-04-20
| |
* | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Gravatar Jie Luo2017-04-10
| | | | | | | | | | | | * Use PyUnicode_AsEncodedString() instead of PyUnicode_AsEncodedObject() * Cherrypick the fix descriptor_pool.FindFileContainingSymbol by extensions.
* | Update version number and changelog for 3.3.0Gravatar Feng Xiao2017-04-05
| |
* | Down-integrate from google3.Gravatar Feng Xiao2017-03-29
| |
* | Merge pull request #2613 from aausch/fix_memory_leakGravatar Jisi Liu2017-03-06
|\ \ | | | | | | optimization and quick workaround to memory leak
* | | Merge 3.2.x branch into master (#2648)Gravatar Paul Yang2017-01-31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Down-integrate internal changes to github. * Update conformance test failure list. * Explicitly import used class in nano test to avoid random test fail. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * maps_test.js: check whether Symbol is defined before using it (#2524) Symbol is not yet available on older versions of Node.js and so this test fails with them. This change just directly checks whether Symbol is available before we try to use it. * Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up * Updated Makefile.am to fix out-of-tree builds * Added Bazel genrule for generating well_known_types_embed.cc In pull request #2517 I made this change for the CMake and autotools builds but forgot to do it for the Bazel build. * Update _GNUC_VER to use the correct implementation of atomic operation on Mac. * Add new js file in extra dist. * Bump version number to 3.2.0 * Fixed issue with autoloading - Invalid paths (#2538) * PHP fix int64 decoding (#2516) * fix int64 decoding * fix int64 decoding + tests * Fix int64 decoding on 32-bit machines. * Fix warning in compiler/js/embed.cc embed.cc: In function ‘std::string CEscape(const string&)’: embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (int i = 0; i < str.size(); ++i) { ^ * Fix include in auto-generated well_known_types_embed.cc Restore include style fix (e3da722) that has been trampled by auto-generation of well_known_types_embed.cc * Fixed cross compilations with the Autotools build Pull request #2517 caused cross compilations to start failing, because the js_embed binary was being built to run on the target platform instead of on the build machine. This change updates the Autotools build to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for the build machine and always use that when building js_embed. * Minor fix for autocreated object repeated fields and maps. - If setting/clearing a repeated field/map that was objects, check the class before checking the autocreator. - Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated classes to ensure there is less chance of issues if someone does something really crazy threading wise. - Some more tests for the internal AutocreatedArray/AutocreatedDictionary classes to ensure things are working as expected. - Add Xcode 8.2 to the full_mac_build.sh supported list. * Fix generation of extending nested messages in JavaScript (#2439) * Fix generation of extending nested messages in JavaScript * Added missing test8.proto to build * Fix generated code when there is no namespace but there is enum definition. * Decoding unknown field should succeed. * Add embed.cc in src/Makefile.am to fix dist check. * Fixed "make distcheck" for the Autotools build To make the test pass I needed to fix out-of-tree builds and update EXTRA_DIST and CLEANFILES. * Remove redundent embed.cc from src/Makefile.am * Update version number to 3.2.0-rc.1 (#2578) * Change protoc-artifacts version to 3.2.0-rc.1 * Update version number to 3.2.0rc2 * Update change logs for 3.2.0 release. * Update php README * Update upb, fixes some bugs (including a hash table problem). (#2611) * Update upb, fixes some bugs (including a hash table problem). * Ruby: added a test for the previous hash table corruption. Verified that this triggers the bug in the currently released version. * Ruby: bugfix for SEGV. * Ruby: removed old code for dup'ing defs. * Reverting deployment target to 7.0 (#2618) The Protobuf library doesn’t require the 7.1 deployment target so reverting it back to 7.0 * Fix typo that breaks builds on big-endian (#2632) * Bump version number to 3.2.0