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
...
Remove Python 2.5 cruft
9 years ago
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>
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
...
Add tox, Python 2.6 compatibility, and many Python 3 compatibility fixes
9 years ago
Dan O'Reilly
46969b99ca
Set DYLD_LIBRARY_PATH for OSX
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Dan O'Reilly
76f8a3fbcd
Travis now only tests Python2.6 on Linux.
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Jisi Liu
c3bc155ace
Merge branch 'master' of github.com:google/protobuf
...
Change-Id: If3fb07754a734bae610d95124528e073515ac525
9 years ago
Jisi Liu
b0f661181d
Down-integrate from internal branch.
...
Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
9 years ago
Douglas Heriot
5021c4d885
Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release build compiler bug.
...
See issue #240 - MSVC in VS2015 seems to inline a function it shouldn't. My original workaround was to disable inlining for the whole file, but I found a way to do it on just this specific function using __declspec(noinline).
Unfortunately __declspec has to go at the start of the function declaration, while __attribute in GCC can go either before or after. I had to move lots of GOOGLE_ATTRIBUTE_NOLINE to make it compile. I have not yet tested this change with GCC.
Will there be other side effects of defining this, given it wasn't previously?
I also noticed a few functions marked with both the 'inline' keyword, and GOOGLE_ATTRIBUTE_NOINLINE - huh? Is there an explanation for this, or is it an oversight?
9 years ago
Joshua Haberman
eb65c69e14
Merge pull request #584 from haberman/cwarnings
...
Ruby: Conform to C89/C90 variable declaration rules.
9 years ago
Dan O'Reilly
3791c8051a
Fix travis build
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Josh Haberman
d61e6adfcc
Return TypedData_Wrap_Struct directly.
...
Change-Id: I6cf77f01370204ad4bc7b345a040a9a3de1706a0
9 years ago
Dan O'Reilly
5de2a81b01
Improve tox.ini, install py26 for travis.
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Dan O'Reilly
afa488c4d1
Remove debug code
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Dan O'Reilly
5029c7b7d3
Install tox during travis build.
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Dan O'Reilly
4a0129f680
Remove ez_setup.py from Makefile.am
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Dan O'Reilly
416f001adc
Use tox in travis build. Tweak tox.ini
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
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.
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Dan O'Reilly
4fefc07ec5
Fix duplicate entry in .gitignore
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Dan O'Reilly
9d689692d3
Make testing cpp implementation optional
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
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>
9 years ago
Dan O'Reilly
7601551f7c
Just always uses BytseIO in text_format for now
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
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
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Dan O'Reilly
2621c8aefb
Get Python 2.6 working.
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Jon Skeet
0cb84ee31f
Merge pull request #720 from jtattermusch/csharp_fixes
...
C# fix for TypeInitializer exception.
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
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Dan O'Reilly
3d5aa6aef9
Fix some more Python 3 compat issues
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Paul Yang
5c370cc55f
Merge pull request #571 from thomasvl/validation_support
...
Add support for a file listing expected package to objc prefixes for validation.
9 years ago
Dan O'Reilly
fe7d9379df
Fixing some long/int bugs
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
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.
...
- Add a env var to pass a set of expected prefixes for validation.
- Report warnings/errors based on the expected prefixes vs. the data in the files compiled.
- Use some helpers from common directory.
9 years ago
Joshua Haberman
53435df594
Merge pull request #716 from haberman/fixruby
...
Fixed several Ruby conformance test cases through upb update.
9 years ago
Jan Tattermusch
2093749caf
Merge pull request #718 from jskeet/descriptor-descriptor
...
Allow public access to descriptor.proto as a dependency.
9 years ago
Jon Skeet
a39ababb7c
Allow public access to descriptor.proto as a dependency.
...
With this in place, generating APIs on github.com/google/googleapis works - previously annotations.proto failed.
Currently there's no access to the annotations (stored as extensions) but we could potentially expose those at a later date.
9 years ago
Feng Xiao
f818183f9b
Merge pull request #673 from podsvirov/topic-cmake-install
...
Install protobuf from cmake project
9 years ago
Dan O'Reilly
981d6bf2f7
Build protobuf files in as part of tox runs.
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
Dan O'Reilly
833c046fb7
Fixing some tests
...
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
9 years ago
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
9 years ago