aboutsummaryrefslogtreecommitdiffhomepage
path: root/python
Commit message (Collapse)AuthorAge
* 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
* | | Drop python2.6Gravatar Jie Luo2017-08-22
| | | | | | | | | | | | | | | | | | | | | Jenkins complains for python 2.6 DEPRECATION: Python 2.6 is no longer supported by the Python core team ERROR: InvocationError: '/tmp/protobuf/protobuf/python/.tox/py26-cpp/bin/python setup.py -q build_py' https://grpc-testing.appspot.com/job/protobuf_pull_request/1502/testReport/junit/(root)/python_cpp/python_cpp/
* | | Add Python 3.5 3.6Gravatar Jie Luo2017-08-22
| | |
* | | 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
|/| | | | | |/ | |/|
| * | Merge pull request #3504 from pherl/3.4.xGravatar Jisi Liu2017-08-18
| |\ \ | | | | | | | | Prefer system distributed binaries/libraries.
* | | | Revert "Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)" (#3524)Gravatar Jie Luo2017-08-18
| | | | | | | | | | | | This reverts commit 703f414ca6102e669ece2dcd5f7d9c2b05ca222e.
* | | | Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)Gravatar cclauss2017-08-18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Drop Python 3.3 from testing & add Python 3.5, 3.6 Python 3.3 goes [EOL](https://docs.python.org/devguide/index.html#branchstatus) next month. * Sync test.sh with the Python versions in tox.ini
* | | | 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
| | | |
* | | | Old style exception --> new style exceptionGravatar cclauss2017-08-17
| | | |
| | * | Prefer system distributed binaries/libraries.Gravatar Jisi Liu2017-08-16
| | | | | | | | | | | | | | | | | | | | | | | | It seems like the image has a /usr/local/bin/autoconf installed, which doesn't recognize/work with the yum installed libtools. Putting distributed binaries/libraries first solves the problem
| * | | clean upGravatar Jisi Liu2017-08-16
| | | |
| * | | Update testpypi addresses.Gravatar Jisi Liu2017-08-16
| |/ / | | | | | | | | | The old one is deprecated and no longer working.
* | | 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 #3281 from BSBandme/ConformanceTestYilunChongGravatar Yilun Chong2017-07-24
|\ \ \ | | | | | | | | Proto2 test message support to conformance test
* \ \ \ 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 pull request #3375 from TeBoring/3.3.xGravatar Paul Yang2017-07-19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Merge 3.3.x into master
| | | | | * \ Merge master into 3.4.xGravatar Jisi Liu2017-07-18
| | | | | |\ \ | |_|_|_|_|/ / |/| | | | | |
| | | | | * | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
| | | | | | |
| * | | | | | Merge 3.3.x into masterGravatar Bo Yang2017-07-18
| |\ \ \ \ \ \
* | | | | | | | Set PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION for pure python comformance testGravatar Jie Luo2017-07-17
|/ / / / / / /
| | | | * | | Merge branch 'master' into ConformanceTestYilunChongGravatar Yilun Chong2017-06-30
| | | | |\ \ \ | |_|_|_|/ / / |/| | | | | |
* | | | | | | Add scripts to build python wheel for linux. (#2693)Gravatar Paul Yang2017-06-28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add scripts to build python wheel for linux. Followed PEP513. * Fix dist check for new added files. * Update README for usage example.
| | | | * | | add proto2 supported for cpp,python,nodejs,ruby,phpGravatar Yilun Chong2017-06-27
| |_|_|/ / / |/| | | | |
| | * | | | 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
| | | |
* | | | Fix Markdown formatting in README.Gravatar Misha Brukman2017-05-23
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | Fix indentation to enable code formatting for sample command lines to set them visually apart from the surrounding text, and make it easy to copy-paste. Add code formatting for env vars, paths, binary and library names for readability. Hide URLs behind text for readability and conciseness.
| * | 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
| |