aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google
Commit message (Expand)AuthorAge
* remove extra collection importGravatar Jisi Liu2015-10-06
* 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
* Merge remote-tracking branch 'origin/master' into fix-authorGravatar Jisi Liu2015-10-05
|\
* | Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
| * Fix Python 3.4 cpp implementationGravatar Dan O'Reilly2015-08-31
|/
* Fixed assignment syntax error.Gravatar Josh Haberman2015-08-28
* Fix for https://github.com/google/protobuf/issues/758Gravatar Josh Haberman2015-08-28
* Excludes a failing python cpp test case.Gravatar Feng Xiao2015-08-26
* Merge branch 'master' of github.com:google/protobuf into beta-1Gravatar Feng Xiao2015-08-26
|\
| * Merge pull request #728 from dano/py3_str_compatGravatar Joshua Haberman2015-08-26
| |\
* | | Update version number.Gravatar Feng Xiao2015-08-26
* | | Merge remote-tracking branch 'origin/master' into beta-1Gravatar Feng Xiao2015-08-25
|\| |
* | | Down-integrate from internal code base.Gravatar Feng Xiao2015-08-23
* | | Down-integrate from google3.Gravatar Feng Xiao2015-08-22
| | * Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Gravatar Dan O'Reilly2015-08-22
| | * Start work on getting text handled properly on PY3Gravatar Dan O'Reilly2015-08-22
| * | assertEquals is deprecatedGravatar Tamir Duberstein2015-08-22
| * | Use assertIsInstanceGravatar Tamir Duberstein2015-08-22
| * | Clean up exception syntaxGravatar Tamir Duberstein2015-08-22
| * | Remove Python 2.5 cruftGravatar 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
| * Just always uses BytseIO in text_format for nowGravatar Dan O'Reilly2015-08-14
| * 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
* | Update version number to 3.0.0-alpha-4Gravatar Bo Yang2015-05-29
* | Update version number to 3.0.0-alpha-3Gravatar teboring2015-05-23
* | 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
|\ \
* | | Fix python versions to comply with pep-0440.Gravatar Jisi Liu2015-03-04
* | | Merge remote-tracking branch 'github/alpha-2-fix'Gravatar Jisi Liu2015-03-04
|\ \ \
| * | | Fix python package version to alpha-2.Gravatar Jisi Liu2015-03-04
* | | | 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