aboutsummaryrefslogtreecommitdiff
path: root/python/google
Commit message (Expand)AuthorAgeFilesLines
...
* Revert back changes to import unittest2 for py26Jisi Liu2015-10-0516-26/+64
* make the python json test less strict on expected errors.Jisi Liu2015-10-051-5/+5
* Merge remote-tracking branch 'origin/master' into fix-authorJisi Liu2015-10-055-78/+159
|\
| * Fix Python 3.4 cpp implementationDan O'Reilly2015-08-315-78/+159
* | Down-integrate from google internal.Jisi Liu2015-10-0538-209/+1667
|/
* Fixed assignment syntax error.Josh Haberman2015-08-281-1/+1
* Fix for https://github.com/google/protobuf/issues/758Josh Haberman2015-08-281-14/+17
* Excludes a failing python cpp test case.Feng Xiao2015-08-261-0/+7
* Merge branch 'master' of github.com:google/protobuf into beta-1Feng Xiao2015-08-262-8/+24
|\
| * Merge pull request #728 from dano/py3_str_compatJoshua Haberman2015-08-262-8/+24
| |\
| | * Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Dan O'Reilly2015-08-222-10/+6
| | * Start work on getting text handled properly on PY3Dan O'Reilly2015-08-221-7/+27
* | | Update version number.Feng Xiao2015-08-261-1/+1
* | | Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-2526-426/+386
|\| |
| * | assertEquals is deprecatedTamir Duberstein2015-08-221-4/+4
| * | Use assertIsInstanceTamir Duberstein2015-08-223-17/+13
| * | Clean up exception syntaxTamir Duberstein2015-08-221-2/+0
| * | Remove Python 2.5 cruftTamir Duberstein2015-08-221-4/+2
| |/
| * Add some clarifying comments. Remove ez_setup.py.Dan O'Reilly2015-08-201-0/+2
| * Fix --cpp_implementation test failure. Test both pure Python and cpp implemen...Dan O'Reilly2015-08-151-8/+8
| * Just always uses BytseIO in text_format for nowDan O'Reilly2015-08-141-4/+1
| * Get Python 2.6 working.Dan O'Reilly2015-08-1416-68/+98
| * 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
| |\
| * | 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
| |/ /
* | | Down-integrate from internal code base.Feng Xiao2015-08-233-28/+99
* | | Down-integrate from google3.Feng Xiao2015-08-2223-665/+969
* | | Down-integrate from internal branch.Jisi Liu2015-08-212-0/+66
| |/ |/|
* | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-06 08:46:50 +0000