Commit Graph

4865 Commits

Author SHA1 Message Date
cclauss
472f700884 remove the parens from the cmp() lambda definition (#3526)
* remove the parens from the cmp() lambda definition

https://github.com/PythonCharmers/python-future/pull/298

* remove the parens from the cmp() lambda definition

https://github.com/PythonCharmers/python-future/pull/298
2017-08-21 10:21:11 -07:00
Jisi Liu
1825d6d8f0 Merge pull request #3317 from ejona86/protoc-artifacts-jdk8
protoc-artifacts: Bump JDK to 8u131
2017-08-18 14:12:05 -07:00
Jie Luo
c2aa26e507 Revert "Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)" (#3524)
This reverts commit 703f414ca6.
2017-08-18 13:15:06 -07:00
cclauss
703f414ca6 Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)
* Drop Python 3.3 from testing & add Python 3.5, 3.6

Python 3.3 goes [EOL](https://docs.python.org/devguide/index.html#branchstatus) next month.

* Sync test.sh with the Python versions in tox.ini
2017-08-18 10:14:00 -07:00
cclauss
a04eb8c191 Define cmp() for Python 3 (#3517)
* Define cmp() for Python 3

http://python-future.org/compatible_idioms.html?highlight=cmp#cmp

* Define cmp() for Python 3

http://python-future.org/compatible_idioms.html?highlight=cmp#cmp
2017-08-18 10:13:10 -07:00
Jie Luo
1aa2c34387 Merge pull request #3516 from cclauss/patch-3
Python 3 compatibility fixes: print(), long(), etc.
2017-08-18 10:11:30 -07:00
cclauss
dded80f924 define long() for Python 3 2017-08-18 01:41:27 +02:00
cclauss
6f4c9b07e4 print() function for Python 3 2017-08-18 01:25:00 +02:00
cclauss
a1acf25327 print() function and lose the semicolons (;) 2017-08-18 01:18:50 +02:00
cclauss
067543cd6d from __future__ import print_function
The future import is required to support the print(x, end=" ") parameter in Python 2.
2017-08-18 01:14:48 +02:00
cclauss
7daedbd8ca print() function & define raw_input() for Python 3 2017-08-18 01:09:14 +02:00
cclauss
45483fd1c0 file() was removed in Python 3, use open() instead
http://python-future.org/compatible_idioms.html#file
2017-08-18 01:04:17 +02:00
Jie Luo
5ab8ae7566 Merge pull request #3511 from cclauss/patch-3
Old style exception --> new style exception
2017-08-17 13:51:22 -07:00
cclauss
958412e2e6 Old style exception --> new style exception 2017-08-17 19:25:39 +02:00
Jisi Liu
5e39ecc569 Merge pull request #3494 from drivehappy/clang_warning_macro
Fixing -Wexpansion-to-defined Clang warning
2017-08-15 14:58:38 -07:00
drivehappy
a23e198cca Fixing warning under Clang 6.x (-Wexpansion-to-defined) where the macro expansion producing 'defined' was warning on undefined behavior. 2017-08-15 11:41:46 -07:00
Jon Skeet
e0d24cc84a Detect invalid tags with a field number of 0 in C#
Previously we only rejected the tag if the tag itself was 0, i.e.
field=0, type=varint. The type doesn't matter: field 0 is always
invalid.

This removes the last of the C# conformance failures.
2017-08-11 19:33:53 +01:00
Feng Xiao
ccb6b62249 Merge pull request #3480 from bklarson/master
Clean up typedefs for Atomic32/Atomic64
2017-08-10 13:03:44 -07:00
Brad Larson
1b423474fd Clean up typedefs for Atomic32/Atomic64
The typedefs for Atomic32 and Atomic64 were sometimes causing
Atomic32 to be an int32 rather than an intptr_t on 32-bit platforms.
On some of these platforms (ARM/CortexM building with GCC 6 in one
case) int32 is a long int, while intptr_t is an int, which causes a
compiler error even though long int and int are both 4 bytes.

Having Atomic32 always be intptr_t on 32-bit platforms and Atomic64
always be intptr_t on 64-bit platforms should resolve any of these
types of errors.
2017-08-10 14:47:13 -05:00
Feng Xiao
35db2675b4 Merge pull request #3473 from AlanBurlison/master
PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLong
2017-08-08 15:49:20 -07:00
Thomas Van Lenten
80e984e007 Merge pull request #3467 from thomasvl/bump_xcode_version
Xcode 8.3.x cleanups and use on travis
2017-08-08 09:19:17 -04:00
alanbur
a68a8004b5 PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLong 2017-08-08 11:56:36 +01:00
Jie Luo
fae381693f Merge pull request #3454 from anandolee/master
Add python 2.6 test back for cpp implementation.
2017-08-07 11:04:09 -07:00
Feng Xiao
d08c291ac7 Merge pull request #3465 from vladmos/list_plus_equals
Make .bzl files compatible with future versions of Bazel
2017-08-07 10:45:20 -07:00
Thomas Van Lenten
fe68821e02 Move travis to the Xcode 8.3 (8.3.3) image. 2017-08-07 12:57:59 -04:00
Thomas Van Lenten
ba81c59cf5 Fix up Xcode 8.3.x support.
- Xcode 8.3.3 bumped the simulators to 10.3.1, so 10.3 fails.  Just use
  the "latest" naming instead to avoid issues.
- Also switch to just testing an old 32bit build and new 64bit build as
  there isn't any code in protobuf that should care about form facts.
  (Looks like the iPad Pro simulator names aren't always constantly, on
  some developer machines they are "iPad Pro (9.7 inch)" while on others
  they are "iPad Pro (9.7-inch)"; so just avoid using them.)
2017-08-07 12:55:46 -04:00
Vladimir Moskva
4fc93044a5 Make .bzl files compatible with future versions of Bazel 2017-08-07 13:33:03 +02:00
Paul Yang
f14703c933 Update commit id in Dockerfile to reflect change in #3391 (#3459) 2017-08-04 16:42:19 -07:00
Paul Yang
49b44bff2b Fix the bug in php c extension that setting one field can change another field's value. (#3455)
* Fix the bug in php c extension that setting one field can change another
field's value.

The reason is that previously, in c extension, it was assumed that the
order that fields were declared in php is the same as the order of
fields in upb. This is not true. Now, for every field in upb, we will
look up the actual property that is corresponding to the upb field.

* Cleanup pull request

* Fix indentation

* Port to php5

* Port with php7.1

* Port to zts
2017-08-04 16:35:49 -07:00
michaelbausor
21b0e5587c Update PHP descriptors (#3391)
* Add descriptors test

* Update descriptors tests

* Add public descriptors

* Add test_desriptors.proto to test script

* Update composer files

* Remove references to GPBType, update tests to be compatible with c

* Update for c extension compatibility

* Remove nested enums for descriptor, update tests

* Strip leading '.' from descriptor name

* Update tests with test for getClass, fix OneofDescriptor

* Add new files to Makefile.am
2017-08-04 16:35:22 -07:00
Jie Luo
f5817b3056 PY26 tests compatibility
1, Some tests in reflection_test PY26 raise TypeError but other versions raise ValueError for convert negative long to unsigned
2, Change compare exception type to compare exception str for testDuplicateExtensionNumber. Original code raise 'Double registration of Extensions' is not an instance of (<type 'exceptions.AssertionError'>, <type 'exceptions.ValueError'>) for PY26 cpp implementation

t
2017-08-04 15:25:11 -07:00
Feng Xiao
1ab5adbdec Merge pull request #3456 from giorgioazzinnaro/patch-1
Update third party addons with ProfaneDB
2017-08-04 12:31:05 -07:00
Giorgio Azzinnaro
a3e17523b4 Update third party addons with ProfaneDB
I added my project ProfaneDB, it is a database for Protocol Buffers objects. Written in C++, it uses gRPC as an interface for other languages.
It is still work in progress, but I'd love to get some feedback on it while I progress!
2017-08-04 21:19:36 +02:00
Jie Luo
9150cd8603 Skip setUpClass which is newly added in python2.7 for python2.6 2017-08-04 10:50:24 -07:00
Jie Luo
d58df3b902 Add python 2.6 test back for cpp implementation. Json format issue was fixed in #869 2017-08-03 16:04:10 -07:00
Paul Yang
25672c1757 Add getClass for php Descriptor in c extension (#3443) 2017-08-02 18:33:25 -07:00
Ryan Gordon
9df89ccabc Fixing HHVM Compatibility (#3437) 2017-08-02 07:43:27 -07:00
Paul Yang
c15a3269f9 Expose descriptor API in php c extension (#3422) 2017-08-02 07:42:27 -07:00
Tony Wong
be73938d72 Change divideInt64ToInt32 to static (#3436)
divideInt64ToInt32 is called statically from protobuf/php/src/Google/Protobuf/Internal/CodedOutputStream.php
(the only reference)
This causes fatal error in PHP 7.1 (32-bit only because 64-bit doesn't use this function)
2017-08-01 13:22:47 -07:00
Brent Shaffer
d32f5b4de3 Removes unnecessary pass-by-references in PHP internal classes (#3433) 2017-08-01 09:42:46 -07:00
Feng Xiao
072431452a Merge pull request #3429 from king6cong/master
Add classpath for java example Makefile
2017-07-31 10:59:56 -07:00
king6cong
547d76ed8e Add classpath for java example Makefile 2017-07-31 14:53:05 +08:00
Thomas Van Lenten
9b505a92bf Merge pull request #3421 from thomasvl/update_comment
Update the comment on the message_type to cover what it should be.
2017-07-26 18:48:19 -04:00
Thomas Van Lenten
9a4692d8af Update the comment on the message_type to cover what it should be. 2017-07-26 17:07:01 -04:00
Thomas Van Lenten
5eb95efa81 Merge pull request #3420 from thomasvl/objc_proto2_conformance
Objc proto2 conformance test support
2017-07-26 16:28:14 -04:00
Thomas Van Lenten
3caf9fd00a Review feedback.
- Better error message for unknown messageType.
- Remove unneeded if.
2017-07-26 16:24:05 -04:00
Thomas Van Lenten
c2831a346c Add the proto2 message conformance support for ObjC. 2017-07-26 15:58:07 -04:00
Thomas Van Lenten
9fd5e59c97 Generate the proto2 test file and link it in for ObjC. 2017-07-26 15:45:23 -04:00
Thomas Van Lenten
21800ff84f Add a objc_class_prefix to test_messages_proto3.proto.
Both test_messages_proto3.proto & test_messages_proto2.proto define
message ForeignMessage {...} and enum ForeignEnum {...} but since
objc doesn't use the proto package in the naming, these end up
conflicting.

Adding the objc_class_prefix option to the proto3 file ensure the generated
objc types are all unique.
2017-07-26 15:44:02 -04:00
Adam Cozzette
8d5f2c57e8 Merge pull request #3410 from adam-26/1745
Fix issue #1745 - javascript allow dot in filename
2017-07-25 15:52:25 -07:00