aboutsummaryrefslogtreecommitdiff
path: root/python
Commit message (Expand)AuthorAgeFilesLines
...
* | Test under tox: Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-131-0/+13
* | Straddle Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-1310-123/+123
* | Don't check in derived objects.Tres Seaver2015-01-132-0/+0
* | Compatibility with Python2.6 unittest.Tres Seaver2015-01-134-21/+35
* | Use 'io.BytesIO' rather than 'cStringIO.StringIO'.Tres Seaver2015-01-132-3/+3
* | Typo.Tres Seaver2015-01-131-1/+1
* | Merge branch 'prep_for_py2_py3_straddle' into straddle_py2_py3Tres Seaver2015-01-131-1/+1
|\ \
| * | Overlooked dependency.Tres Seaver2015-01-131-1/+1
* | | Merge branch 'drop-apputils-dependency' into straddle_py2_py3Tres Seaver2015-01-1324-96/+100
|\ \ \ | |/ / |/| |
| * | Drop dependency on 'google.apputils'.Tres Seaver2015-01-1322-96/+100
| |/
* / Prepare for Python2-Python3 straddle.Tres Seaver2015-01-1315-198/+144
|/
* Merge pull request #143 from Ivoz/patch-1Feng Xiao2014-12-221-2/+2
|\
| * Update python version / setuptools instructionsMatt Iversen2014-12-171-2/+2
* | Merge pull request #46 from adalq/versionFeng Xiao2014-12-201-0/+35
|\ \ | |/ |/|
| * Updated __version__Adal Chiriliuc2014-12-141-1/+1
| * Add __version__Adal Chiriliuc2014-10-101-0/+35
| * Revert "Add __version__"Adal Chiriliuc2014-10-102-35/+0
| * Add __version__Adal Chiriliuc2014-10-102-0/+35
* | Update version number to v3.0.0-preFeng Xiao2014-12-101-1/+1
* | Update version number to v3.0.0-alpha-1Feng Xiao2014-12-031-1/+1
* | Fix Python C++ implementation build issues:Feng Xiao2014-11-252-5/+9
* | Down-integrate from internal code base.Feng Xiao2014-11-201-1/+1
* | Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-143-24/+20
* | Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobu...Feng Xiao2014-11-116-6/+6
|\ \
| * | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-086-6/+6
* | | Down-integrate from internal code base.Feng Xiao2014-11-1045-594/+1223
|/ /
* | Merge pull request #50 from dlitz/compat-py3kFeng Xiao2014-11-081-2/+11
|\ \
| * | Omit google-apputils dependency under Python 3Dwayne Litzenberger2014-10-141-1/+5
| * | Use 2to3 when building under Python 3.Dwayne Litzenberger2014-10-141-1/+6
* | | Update version number to 2.6.2-pre.Feng Xiao2014-10-211-1/+1
* | | Update version number to 2.6.1.v2.6.1Feng Xiao2014-10-201-1/+1
|/ /
* / Update version number to 2.6.1rc1Feng Xiao2014-10-081-1/+1
|/
* Down-integrate from internal branch.Feng Xiao2014-10-074-6/+22
* Merge pull request #3 from dhirschfeld/pyext-fixFeng Xiao2014-10-021-0/+1
|\
| * Explicitly specify pyext/cpp_message.py in py_modules listDavid Hirschfeld2014-08-271-0/+1
* | Replace links to code.google.com/protobuf with developers.google.com/protocol...Feng Xiao2014-10-0169-70/+70
|/
* merge 2.6.0 to trunkv2.6.0jieluo@google.com2014-08-252-8/+5
* merge tags/2.6.0 into trunkjieluo@google.com2014-08-254-41/+33
* make dist complains the file name is too long and refuse to put it to tar. Ch...jieluo@google.com2014-08-141-1/+1
* Add deleted tests back for reflection_cpp2_test.py by addtional exception catchjieluo@google.com2014-08-141-0/+47
* change python README.txtjieluo@google.com2014-08-131-3/+8
* put python cpp tests into pyext/jieluo@google.com2014-08-135-34/+9
* add shared_pr.hjieluo@google.com2014-08-122-9/+10
* down integrate python opensource to svnjieluo@google.com2014-08-1262-962/+9928
* down integrate to svnjieluo@google.com2014-07-186-2262/+37
* Update version number in trunkxiaofeng@google.com2013-02-281-2/+1
* Exclude a failing test in MingW build.xiaofeng@google.com2013-02-261-1/+2
* Down-integrate from internal branchxiaofeng@google.com2013-02-252-2/+27
* Fix issue 438: add missing 'enum_type_wrapper' to setup.pyxiaofeng@google.com2012-12-081-0/+1
* Find the protoc from environ first for python.liujisi@google.com2012-12-051-1/+3