aboutsummaryrefslogtreecommitdiff
path: root/python/google
Commit message (Expand)AuthorAgeFilesLines
* Fix usage of assertItemsEqual on Py3Dan O'Reilly2015-08-141-2/+2
* Fix some more Python 3 compat issuesDan O'Reilly2015-08-143-14/+25
* Fixing some long/int bugsDan O'Reilly2015-08-144-12/+21
* Fixing some testsDan O'Reilly2015-08-133-7/+8
* Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-1257-3128/+9062
|\
| * Internal local modifications.Bo Yang2015-07-091-0/+7
| * Update version number to 3.0.0-alpha-4Bo Yang2015-05-291-1/+1
| * Update version number to 3.0.0-alpha-3teboring2015-05-231-1/+1
| * down-integrate internal changesBo Yang2015-05-2141-544/+3281
| * WhitespaceTamir Duberstein2015-05-061-1/+1
| * Don't hard-code the python pathTamir Duberstein2015-05-0615-15/+15
| * [PYTHON] Drop dependency on 'google.apputils'.Tamir Duberstein2015-04-1015-89/+94
| * [PYTHON] Remove awkward duplicate testsTamir Duberstein2015-04-103-162/+0
| * [PYTHON] Clarify API version commentTamir Duberstein2015-04-101-2/+2
| * Remove useless file that doesn't loadTamir Duberstein2015-04-081-663/+0
| * Merge pull request #196 from Zex/masterJoshua Haberman2015-03-311-2/+2
| |\
| | * fix raise syntax issues for py3,zex2015-02-061-2/+2
| * | Fix python versions to comply with pep-0440.Jisi Liu2015-03-041-1/+1
| * | Merge remote-tracking branch 'github/alpha-2-fix'Jisi Liu2015-03-041-1/+1
| |\ \
| | * | Fix python package version to alpha-2.Jisi Liu2015-03-041-1/+1
| * | | Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-286-15/+22
| |/ /
| * | Fixes for Python/C++ implementation in open-source:Josh Haberman2015-02-259-23/+484
| * | Down integrate from Google internal.Jisi Liu2015-02-2534-2057/+5683
| |/
| * Delete unused files.Feng Xiao2015-01-271-27/+0
* | 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-133-14/+35
* | Use 'io.BytesIO' rather than 'cStringIO.StringIO'.Tres Seaver2015-01-132-3/+3
* | Typo.Tres Seaver2015-01-131-1/+1
* | Merge branch 'drop-apputils-dependency' into straddle_py2_py3Tres Seaver2015-01-1323-91/+100
|\ \
| * | Drop dependency on 'google.apputils'.Tres Seaver2015-01-1321-91/+100
| |/
* / Prepare for Python2-Python3 straddle.Tres Seaver2015-01-1315-198/+144
|/
* 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
* | Fix Python C++ implementation build issues:Feng Xiao2014-11-251-4/+8
* | 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-115-5/+5
|\ \
| * | typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-085-5/+5
| |/
* / Down-integrate from internal code base.Feng Xiao2014-11-1044-594/+1220
|/
* Down-integrate from internal branch.Feng Xiao2014-10-074-6/+22
* Replace links to code.google.com/protobuf with developers.google.com/protocol...Feng Xiao2014-10-0167-67/+67
* merge tags/2.6.0 into trunkjieluo@google.com2014-08-252-22/+1
* 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
* put python cpp tests into pyext/jieluo@google.com2014-08-134-26/+0
* down integrate python opensource to svnjieluo@google.com2014-08-1259-864/+9873
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-31 17:29:36 +0000