AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity
2,854 Commits 35 Branches 138 Tags 124 MiB
d4569d1f5e
Commit Graph

112 Commits

Author SHA1 Message Date
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
78d040a18b remove extra collection import 2015-10-06 11:02:24 -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
Jisi Liu
b0f661181d Down-integrate from internal branch. 
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
 2015-08-21 11:18:45 -07: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
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
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
Dan O'Reilly
fe7d9379df Fixing some long/int bugs 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-14 15:26:33 -04:00
Dan O'Reilly
833c046fb7 Fixing some tests 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-08-13 01:17:26 -04:00
Dan O'Reilly
e47cdd5a55 Merge remote-tracking branch 'upstream/master' into py2_py3_straddle 
Conflicts:
	python/google/protobuf/descriptor_pool.py
	python/google/protobuf/internal/api_implementation_default_test.py
	python/google/protobuf/internal/cpp_message.py
	python/google/protobuf/internal/descriptor_database_test.py
	python/google/protobuf/internal/descriptor_pool_test.py
	python/google/protobuf/internal/descriptor_python_test.py
	python/google/protobuf/internal/descriptor_test.py
	python/google/protobuf/internal/generator_test.py
	python/google/protobuf/internal/message_factory_python_test.py
	python/google/protobuf/internal/message_factory_test.py
	python/google/protobuf/internal/message_test.py
	python/google/protobuf/internal/proto_builder_test.py
	python/google/protobuf/internal/python_message.py
	python/google/protobuf/internal/reflection_test.py
	python/google/protobuf/internal/service_reflection_test.py
	python/google/protobuf/internal/symbol_database_test.py
	python/google/protobuf/internal/text_encoding_test.py
	python/google/protobuf/internal/text_format_test.py
	python/google/protobuf/internal/unknown_fields_test.py
	python/google/protobuf/internal/wire_format_test.py
	python/google/protobuf/pyext/descriptor_cpp2_test.py
	python/google/protobuf/pyext/message_factory_cpp2_test.py
	python/google/protobuf/pyext/reflection_cpp2_generated_test.py
	python/setup.py
	ruby/lib/google/protobuf/message_exts.rb
 2015-08-12 23:57:46 -04:00
Bo Yang
9f563bd0d8 Internal local modifications. 2015-07-09 12:39:52 -07:00
Bo Yang
e107e2d68e Update version number to 3.0.0-alpha-4 2015-05-29 11:00:57 -07:00
teboring
9839c0c2c9 Update version number to 3.0.0-alpha-3 2015-05-23 09:20:23 -07:00
Bo Yang
5db217305f down-integrate internal changes 2015-05-21 19:32:02 -07:00
Tamir Duberstein
4f5cbe6ead Whitespace 2015-05-06 17:02:57 -04:00
Tamir Duberstein
9d9d0b70de Don't hard-code the python path 2015-05-06 17:02:57 -04:00
Tamir Duberstein
9f42f5f4a4 [PYTHON] Drop dependency on 'google.apputils'. 
Use stdlib's 'unittest' instead.
 2015-04-10 19:43:51 -04:00
Tamir Duberstein
dab96f19ee [PYTHON] Remove awkward duplicate tests 
We already run all tests with and without `--cpp_implementation`
 2015-04-10 19:43:50 -04:00
Tamir Duberstein
ef1b747a42 [PYTHON] Clarify API version comment 2015-04-10 09:46:21 -04:00
Tamir Duberstein
8ede2817a0 Remove useless file that doesn't load 
This file was broken in ada6556.
 2015-04-08 18:33:04 -04:00
Joshua Haberman
42809ef8fe Merge pull request #196 from Zex/master 
Fix raise and except syntax issues for py3
 2015-03-31 12:30:17 -07:00
Jisi Liu
4573e110b8 Fix python versions to comply with pep-0440. 
Change-Id: Ifb4958e4f371b36f249faa466473f851697edb5c
 2015-03-04 16:45:13 -08:00
Jisi Liu
e4a9ace541 Merge remote-tracking branch 'github/alpha-2-fix' 
Change-Id: I4c5186b8451713fda38e60dc3f828da6196c7a5e
 2015-03-04 15:37:21 -08:00
Jisi Liu
8e61d323bf Fix python package version to alpha-2. 
Change-Id: Iae16dcae833959681a5c8e98764e5d1071e6fdcf
 2015-03-04 15:28:35 -08:00
Jisi Liu
885b612f74 Down integrate from Google internal branch for C++ and Java. 
- Maps for C++ lite
- C++ Arena optimizations.
- Java Lite runtime code size optimization.

Change-Id: I7537a4357c1cb385d23f9e8aa7ffdfeefe079f13
 2015-02-28 17:06:49 -08:00
Josh Haberman
0b70a43736 Fixes for Python/C++ implementation in open-source: 
* Rosy hack doesn't apply (that test should be removed
    for the open-source release).

  * Added our own copy of parameterized.py (the open-source
    version of Google Apputils doesn't contain it).

  * The C++ Descriptor object didn't implement extension_ranges.

  * Had to implement a hack around returning EncodeError, to
    work around the module-loading behavior of the test runner.
 2015-02-25 20:17:32 -08:00
Jisi Liu
ada6556785 Down integrate from Google internal. 
Change-Id: I34d301133eea9c6f3a822c47d1f91e136fd33145
 2015-02-25 16:39:11 -08:00
zex
a4f634ce74 fix raise syntax issues for py3, 
fix except syntax issue for py3
 2015-02-06 13:51:49 +08:00