aboutsummaryrefslogtreecommitdiffhomepage
path: root/python
Commit message (Expand)AuthorAge
* 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
| |/
| * Set DYLD_LIBRARY_PATH for OSXGravatar Dan O'Reilly2015-08-21
* | Down-integrate from internal branch.Gravatar Jisi Liu2015-08-21
| * Fix travis buildGravatar Dan O'Reilly2015-08-20
| * Improve tox.ini, install py26 for travis.Gravatar Dan O'Reilly2015-08-20
| * Remove debug codeGravatar Dan O'Reilly2015-08-20
| * Use tox in travis build. Tweak tox.iniGravatar Dan O'Reilly2015-08-20
| * Add some clarifying comments. Remove ez_setup.py.Gravatar Dan O'Reilly2015-08-20
| * Make testing cpp implementation optionalGravatar Dan O'Reilly2015-08-16
| * 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
| * Disable py3* in toxGravatar 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
| * Build protobuf files in as part of tox runs.Gravatar Dan O'Reilly2015-08-13
| * 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
* | Replace the check of "../.git"Gravatar Feng Xiao2015-05-26
* | Update version number to 3.0.0-alpha-3Gravatar teboring2015-05-23
* | down-integrate internal changesGravatar Bo Yang2015-05-21
* | Only generate protos in developmentGravatar Tamir Duberstein2015-05-15
* | Use glob to simplifyGravatar Tamir Duberstein2015-05-15
* | Merge pull request #255 from btabibian/masterGravatar Joshua Haberman2015-05-07
|\ \
| * | mendGravatar Behzad Tabibian2015-05-07
* | | Noramlize 'setup.py' to fit conventions:Gravatar Tamir Duberstein2015-05-06
* | | WhitespaceGravatar Tamir Duberstein2015-05-06
* | | Don't hard-code the python pathGravatar Tamir Duberstein2015-05-06
| * | adding globals() to exec call for python3 compatibilityGravatar Behzad Tabibian2015-04-28
* | | [PYTHON] Drop dependency on 'google.apputils'.Gravatar Tamir Duberstein2015-04-10
* | | [PYTHON] Remove awkward duplicate testsGravatar Tamir Duberstein2015-04-10
* | | [PYTHON] README: explain homebrew shenanigansGravatar Tamir Duberstein2015-04-10
* | | [PYTHON] Remove unnecessary `include_dir`Gravatar Tamir Duberstein2015-04-10