Commit Graph

198 Commits

Author SHA1 Message Date
Manjunath Kudlur
96537c461a Bringing in internal::shared_ptr into google:protobuf namespace.
Fixes #1029
2015-12-09 07:40:30 -08:00
Manjunath Kudlur
3f9b4f2944 Updated for c++98 compatibility 2015-12-07 14:15:29 -08:00
Manjunath Kudlur
3ff1dca0bd Enable fast cpp protos in the python interface. 2015-12-07 13:08:21 -08:00
Josh Haberman
4b31ffa488 Added Python failure lists, and fixes to make sure failure propagates. 2015-12-03 12:54:54 -08:00
Josh Haberman
325392dd61 Conformance test implementation for Python. 2015-12-02 12:53:42 -08:00
Josh Haberman
c3ca920509 Pass $CC environment variable through tox. 2015-10-28 17:07:02 -07:00
Josh Haberman
d8814ed59e Special-case Clang-only warning flags to Clang. 2015-10-28 17:07:02 -07:00
Josh Haberman
30cbd4c561 Disable some more warnings to be warnings-free. 2015-10-28 17:05:47 -07:00
Josh Haberman
70ffefa551 Fixed compile errors after rebase. 2015-10-28 17:05:47 -07:00
Josh Haberman
00700b7219 Removed all warnings from the Python/C++ build.
Also made the Travis build ensure that no warnings
are present.

These builds were previously spewing many warnings,
which was hiding warnings for important things like
accidentally using C++11-only features.

Change-Id: I56caeee9db48bc78756a3e8d7c14874630627037
2015-10-28 17:05:47 -07:00
Jie Luo
2850a98275 fix json_format for python2.6:
1, objcect_pair_hook is not supported in python2.6, so duplicated key check is removed in 2.6
2, total_seconds is not suppoted in python2.6, changed to compute seconds directly
2015-10-19 16:25:54 -07:00
Jisi Liu
f6fa5c7882 add complete WKT for python. 2015-10-06 14:26:00 -07:00
Jisi Liu
7464f40a7e Generate well known types for python. 2015-10-06 14:20:26 -07:00
Jisi Liu
78d040a18b remove extra collection import 2015-10-06 11:02:24 -07:00
Jisi Liu
72bd9c959a disable tests for python-cpp under py26 as well. 2015-10-06 10:48:57 -07:00
Jisi Liu
f509c7b2f5 disable py2.6 tests for json_format_test 2015-10-05 16:14:50 -07:00
Jisi Liu
dbea00ae88 Revert back changes to import unittest2 for py26 2015-10-05 16:08:22 -07:00
Jisi Liu
a783eaf37f make the python json test less strict on expected errors. 2015-10-05 15:06:06 -07:00
Jisi Liu
8d8177c757 Merge remote-tracking branch 'origin/master' into fix-author 2015-10-05 13:54:05 -07:00
Jisi Liu
46e8ff63cb Down-integrate from google internal. 2015-10-05 11:59:43 -07:00
Dan O'Reilly
d9598ca55d Fix Python 3.4 cpp implementation
Fixes the ScalarMapContainer/MessageMapContainer implementations on
Python 3.4, by dynamically allocating their PyTypeObjects using
PyType_FromSpecWithBases, instead of statically allocating them. This is
necessary because Python 3.4+ disallows statically allocating a class
with a dynamically allocated parent.

Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-31 16:42:31 -04:00
Josh Haberman
4472b4ad15 Fixed assignment syntax error.
Change-Id: Ifef8a300258214aae8f6b8516fbc61b7335b5724
2015-08-28 19:21:49 -07:00
Josh Haberman
fc80fad9d5 Fix for https://github.com/google/protobuf/issues/758
Change-Id: I590b34b96c84a3ba6e094a0bd86f153147ade3d3
2015-08-28 16:34:48 -07:00
Feng Xiao
a3a2605d5c Excludes a failing python cpp test case. 2015-08-26 21:56:26 -07:00
Feng Xiao
e94e062b58 Merge branch 'master' of github.com:google/protobuf into beta-1 2015-08-26 15:47:35 -07:00
Joshua Haberman
c7a1f8ec3b Merge pull request #728 from dano/py3_str_compat
Get all tests passing on Python3 (except Python3.4 cpp implementation)
2015-08-26 15:44:06 -07:00
Feng Xiao
ffe9215140 Update version number.
Protoc, C++ runtime and Java runtime are updated to v3.0.0-beta-1, other
languages are updated to v3.0.0-alpha-4.
2015-08-26 15:11:43 -07:00
Feng Xiao
b192ba87f7 Merge remote-tracking branch 'origin/master' into beta-1 2015-08-25 20:24:43 -07:00
Feng Xiao
b17ec3ca11 Down-integrate from internal code base. 2015-08-23 17:50:38 -07:00
Feng Xiao
eee38b0c01 Down-integrate from google3. 2015-08-22 18:25:48 -07:00
Dan O'Reilly
38eef02aab Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-22 13:07:12 -04:00
Dan O'Reilly
fc80874adf Start work on getting text handled properly on PY3 2015-08-22 13:07:12 -04:00
Tamir Duberstein
87993d7507 assertEquals is deprecated 2015-08-22 13:06:24 -04:00
Tamir Duberstein
821fcb2ded Use assertIsInstance 2015-08-22 12:56:34 -04:00
Tamir Duberstein
09831c8768 Clean up exception syntax 2015-08-22 12:55:19 -04:00
Tamir Duberstein
322d8939fc Remove Python 2.5 cruft 2015-08-22 12:54:31 -04:00
Dan O'Reilly
46969b99ca Set DYLD_LIBRARY_PATH for OSX
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-21 19:28:18 -04:00
Jisi Liu
b0f661181d Down-integrate from internal branch.
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
2015-08-21 11:18:45 -07:00
Dan O'Reilly
3791c8051a Fix travis build
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-20 20:49:45 -04:00
Dan O'Reilly
5de2a81b01 Improve tox.ini, install py26 for travis.
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-20 18:19:56 -04:00
Dan O'Reilly
afa488c4d1 Remove debug code
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-20 15:51:06 -04:00
Dan O'Reilly
416f001adc Use tox in travis build. Tweak tox.ini
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-20 15:29:10 -04:00
Dan O'Reilly
3bdfb4b695 Add some clarifying comments. Remove ez_setup.py.
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-20 13:52:19 -04:00
Dan O'Reilly
9d689692d3 Make testing cpp implementation optional
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-16 13:56:25 -04:00
Dan O'Reilly
3083d8cee7 Fix --cpp_implementation test failure. Test both pure Python and cpp implementation in tox.
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-15 10:07:38 -04:00
Dan O'Reilly
7601551f7c Just always uses BytseIO in text_format for now
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-14 23:22:47 -04:00
Dan O'Reilly
7013a75b90 Disable py3* in tox
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-14 23:09:29 -04:00
Dan O'Reilly
2621c8aefb Get Python 2.6 working.
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-14 22:54:53 -04:00
Dan O'Reilly
d06adbd4a4 Fix usage of assertItemsEqual on Py3
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-14 16:16:00 -04:00
Dan O'Reilly
3d5aa6aef9 Fix some more Python 3 compat issues
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
2015-08-14 16:12:34 -04:00