2886 Commits (3a72a1eeafa4cd6747d0039a527caa49924aa265)
 

Author SHA1 Message Date
Feng Xiao 839b180dba Cherry-pick Java utf8 change. 9 years ago
Feng Xiao b17ec3ca11 Down-integrate from internal code base. 9 years ago
Feng Xiao eee38b0c01 Down-integrate from google3. 9 years ago
Joshua Haberman 3253634dcb Merge pull request #711 from tamird/python3-prep 9 years ago
Dan O'Reilly 38eef02aab Fix metaclass issue on Python 3. Get text handling tests passing on Python 3. 9 years ago
Dan O'Reilly fc80874adf Start work on getting text handled properly on PY3 9 years ago
Tamir Duberstein 87993d7507 assertEquals is deprecated 9 years ago
Tamir Duberstein 821fcb2ded Use assertIsInstance 9 years ago
Tamir Duberstein 09831c8768 Clean up exception syntax 9 years ago
Tamir Duberstein 322d8939fc Remove Python 2.5 cruft 9 years ago
Joshua Haberman 3ff5625231 Merge pull request #722 from dano/py2_py3_straddle 9 years ago
Dan O'Reilly 46969b99ca Set DYLD_LIBRARY_PATH for OSX 9 years ago
Dan O'Reilly 76f8a3fbcd Travis now only tests Python2.6 on Linux. 9 years ago
Jisi Liu c3bc155ace Merge branch 'master' of github.com:google/protobuf 9 years ago
Jisi Liu b0f661181d Down-integrate from internal branch. 9 years ago
Douglas Heriot 5021c4d885 Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release build compiler bug. 9 years ago
Joshua Haberman eb65c69e14 Merge pull request #584 from haberman/cwarnings 9 years ago
Dan O'Reilly 3791c8051a Fix travis build 9 years ago
Josh Haberman d61e6adfcc Return TypedData_Wrap_Struct directly. 9 years ago
Dan O'Reilly 5de2a81b01 Improve tox.ini, install py26 for travis. 9 years ago
Dan O'Reilly afa488c4d1 Remove debug code 9 years ago
Dan O'Reilly 5029c7b7d3 Install tox during travis build. 9 years ago
Dan O'Reilly 4a0129f680 Remove ez_setup.py from Makefile.am 9 years ago
Dan O'Reilly 416f001adc Use tox in travis build. Tweak tox.ini 9 years ago
Dan O'Reilly de22561b7b Merge branch 'py2_py3_straddle' of github.com:dano/protobuf into py2_py3_straddle 9 years ago
Dan O'Reilly 3bdfb4b695 Add some clarifying comments. Remove ez_setup.py. 9 years ago
Dan O'Reilly 4fefc07ec5 Fix duplicate entry in .gitignore 9 years ago
Dan O'Reilly 9d689692d3 Make testing cpp implementation optional 9 years ago
Dan O'Reilly 3083d8cee7 Fix --cpp_implementation test failure. Test both pure Python and cpp implementation in tox. 9 years ago
Dan O'Reilly 7601551f7c Just always uses BytseIO in text_format for now 9 years ago
Dan O'Reilly 893b65e469 Merge remote-tracking branch 'upstream/master' into py2_py3_straddle 9 years ago
Dan O'Reilly 7013a75b90 Disable py3* in tox 9 years ago
Dan O'Reilly 2621c8aefb Get Python 2.6 working. 9 years ago
Jon Skeet 0cb84ee31f Merge pull request #720 from jtattermusch/csharp_fixes 9 years ago
Jan Tattermusch fa2fe35dec fix type initialization problem with FileDescriptor 9 years ago
Jan Tattermusch 143688f68b add a failing descriptor test 9 years ago
Jan Tattermusch a55a4449ef remove duplicate test case 9 years ago
Dan O'Reilly d06adbd4a4 Fix usage of assertItemsEqual on Py3 9 years ago
Dan O'Reilly 3d5aa6aef9 Fix some more Python 3 compat issues 9 years ago
Paul Yang 5c370cc55f Merge pull request #571 from thomasvl/validation_support 9 years ago
Dan O'Reilly fe7d9379df Fixing some long/int bugs 9 years ago
Dan O'Reilly 6654e77f1d Merge remote-tracking branch 'upstream/master' into py2_py3_straddle 9 years ago
Thomas Van Lenten 4e43931eaf Add support for a file listing expected package to objc prefixes for validation. 9 years ago
Joshua Haberman 53435df594 Merge pull request #716 from haberman/fixruby 9 years ago
Jan Tattermusch 2093749caf Merge pull request #718 from jskeet/descriptor-descriptor 9 years ago
Jon Skeet a39ababb7c Allow public access to descriptor.proto as a dependency. 9 years ago
Feng Xiao f818183f9b Merge pull request #673 from podsvirov/topic-cmake-install 9 years ago
Dan O'Reilly 981d6bf2f7 Build protobuf files in as part of tox runs. 9 years ago
Dan O'Reilly 833c046fb7 Fixing some tests 9 years ago
Dan O'Reilly e47cdd5a55 Merge remote-tracking branch 'upstream/master' into py2_py3_straddle 9 years ago