aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/internal
Commit message (Expand)AuthorAge
...
* Revert back changes to import unittest2 for py26Gravatar Jisi Liu2015-10-05
* make the python json test less strict on expected errors.Gravatar Jisi Liu2015-10-05
* Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
* Excludes a failing python cpp test case.Gravatar Feng Xiao2015-08-26
* Merge remote-tracking branch 'origin/master' into beta-1Gravatar Feng Xiao2015-08-25
|\
* | Down-integrate from google3.Gravatar Feng Xiao2015-08-22
| * assertEquals is deprecatedGravatar Tamir Duberstein2015-08-22
| * Use assertIsInstanceGravatar Tamir Duberstein2015-08-22
* | Down-integrate from internal branch.Gravatar Jisi Liu2015-08-21
| * Add some clarifying comments. Remove ez_setup.py.Gravatar Dan O'Reilly2015-08-20
| * Fix --cpp_implementation test failure. Test both pure Python and cpp implemen...Gravatar Dan O'Reilly2015-08-15
| * Get Python 2.6 working.Gravatar Dan O'Reilly2015-08-14
| * Fix usage of assertItemsEqual on Py3Gravatar Dan O'Reilly2015-08-14
| * Fix some more Python 3 compat issuesGravatar Dan O'Reilly2015-08-14
| * Fixing some long/int bugsGravatar Dan O'Reilly2015-08-14
| * Fixing some testsGravatar Dan O'Reilly2015-08-13
| * Merge remote-tracking branch 'upstream/master' into py2_py3_straddleGravatar Dan O'Reilly2015-08-12
| |\ | |/ |/|
* | Internal local modifications.Gravatar Bo Yang2015-07-09
* | down-integrate internal changesGravatar Bo Yang2015-05-21
* | WhitespaceGravatar Tamir Duberstein2015-05-06
* | Don't hard-code the python pathGravatar Tamir Duberstein2015-05-06
* | [PYTHON] Drop dependency on 'google.apputils'.Gravatar Tamir Duberstein2015-04-10
* | [PYTHON] Remove awkward duplicate testsGravatar Tamir Duberstein2015-04-10
* | [PYTHON] Clarify API version commentGravatar Tamir Duberstein2015-04-10
* | Remove useless file that doesn't loadGravatar Tamir Duberstein2015-04-08
* | Merge pull request #196 from Zex/masterGravatar Joshua Haberman2015-03-31
|\ \
* | | Down integrate from Google internal branch for C++ and Java.Gravatar Jisi Liu2015-02-28
* | | Fixes for Python/C++ implementation in open-source:Gravatar Josh Haberman2015-02-25
* | | Down integrate from Google internal.Gravatar Jisi Liu2015-02-25
| * | fix raise syntax issues for py3,Gravatar zex2015-02-06
|/ /
* | Delete unused files.Gravatar Feng Xiao2015-01-27
| * Straddle Python 2.6, 2.7, 3.3, 3.4.Gravatar Tres Seaver2015-01-13
| * Compatibility with Python2.6 unittest.Gravatar Tres Seaver2015-01-13
| * Use 'io.BytesIO' rather than 'cStringIO.StringIO'.Gravatar Tres Seaver2015-01-13
| * Typo.Gravatar Tres Seaver2015-01-13
| * Merge branch 'drop-apputils-dependency' into straddle_py2_py3Gravatar Tres Seaver2015-01-13
| |\
| | * Drop dependency on 'google.apputils'.Gravatar Tres Seaver2015-01-13
| |/ |/|
| * Prepare for Python2-Python3 straddle.Gravatar Tres Seaver2015-01-13
|/
* Down-integrate from internal code base (C++ maps support).Gravatar Feng Xiao2014-11-14
* Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobu...Gravatar Feng Xiao2014-11-11
|\
* | Down-integrate from internal code base.Gravatar Feng Xiao2014-11-10
| * typo fixes - https://github.com/vlajos/misspell_fixerGravatar Veres Lajos2014-11-08
|/
* Down-integrate from internal branch.Gravatar Feng Xiao2014-10-07
* Replace links to code.google.com/protobuf with developers.google.com/protocol...Gravatar Feng Xiao2014-10-01
* merge tags/2.6.0 into trunkGravatar jieluo@google.com2014-08-25
* make dist complains the file name is too long and refuse to put it to tar. Ch...Gravatar jieluo@google.com2014-08-14
* Add deleted tests back for reflection_cpp2_test.py by addtional exception catchGravatar jieluo@google.com2014-08-14
* put python cpp tests into pyext/Gravatar jieluo@google.com2014-08-13
* down integrate python opensource to svnGravatar jieluo@google.com2014-08-12
* Down-integrate from internal branchGravatar xiaofeng@google.com2013-02-25