aboutsummaryrefslogtreecommitdiff
path: root/python
Commit message (Expand)AuthorAgeFilesLines
* 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-263-11/+27
|\
| * Merge pull request #728 from dano/py3_str_compatJoshua Haberman2015-08-263-11/+27
| |\
| | * Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Dan O'Reilly2015-08-223-13/+9
| | * 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-2529-741/+432
|\| |
| * | 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
| |/
| * Set DYLD_LIBRARY_PATH for OSXDan O'Reilly2015-08-211-0/+1
| * Fix travis buildDan O'Reilly2015-08-202-0/+3
| * Improve tox.ini, install py26 for travis.Dan O'Reilly2015-08-201-7/+10
| * Remove debug codeDan O'Reilly2015-08-201-1/+0
| * Use tox in travis build. Tweak tox.iniDan O'Reilly2015-08-202-2/+4
| * Add some clarifying comments. Remove ez_setup.py.Dan O'Reilly2015-08-204-345/+5
| * Make testing cpp implementation optionalDan O'Reilly2015-08-161-2/+1
| * Fix --cpp_implementation test failure. Test both pure Python and cpp implemen...Dan O'Reilly2015-08-152-8/+9
| * Just always uses BytseIO in text_format for nowDan O'Reilly2015-08-141-4/+1
| * Disable py3* in toxDan O'Reilly2015-08-141-1/+2
| * Get Python 2.6 working.Dan O'Reilly2015-08-1417-69/+104
| * 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
| * Build protobuf files in as part of tox runs.Dan O'Reilly2015-08-131-0/+1
| * Fixing some testsDan O'Reilly2015-08-134-42/+30
| * Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-1259-3198/+9181
| |\
| * | Declare explicit support for Python 3.3 and 3.4.Tres Seaver2015-01-131-0/+4
| * | Merge branch 'python-update_setup' into straddle_py2_py3Tres Seaver2015-01-132-37/+32
| |\ \
| | * | Noramlize 'setup.py' to fit conventions:Tres Seaver2015-01-132-37/+32
| * | | Merge branch 'update-ez_setup' into straddle_py2_py3Tres Seaver2015-01-131-244/+292
| |\ \ \
| | * | | Update to new canonical 'ez_setup.py'.Tres Seaver2015-01-131-244/+292
| | |/ /
| * | | 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
| |/ /
* | | 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-213-0/+72
| |/ |/|
* | Internal local modifications.Bo Yang2015-07-091-0/+7
* | Update version number to 3.0.0-alpha-4Bo Yang2015-05-291-1/+1
* | Replace the check of "../.git"Feng Xiao2015-05-261-25/+24
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-29 08:41:14 +0000