Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Bump version number for GA | Jisi Liu | 2016-07-25 | 1 | -1/+1 |
| | |||||
* | Update version number to 3.0.0-beta-4 | Feng Xiao | 2016-07-13 | 1 | -1/+1 |
| | |||||
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 11 | -100/+82 |
| | |||||
* | Fix spelling in strings and comments | Otto Kekäläinen | 2016-07-03 | 2 | -4/+4 |
| | |||||
* | Fixed string formatting in text_format.py to be Python2.6-compatible | Adam Cozzette | 2016-06-30 | 1 | -2/+2 |
| | | | | | | In Python 2.6 the positional argument specifiers are apparently required to be explicitly specified: http://stackoverflow.com/questions/10054122/valueerror-zero-length-field-name-in-format-python | ||||
* | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 | 21 | -872/+2009 |
| | | | | This includes all internal changes from around May 20 to now. | ||||
* | Make surrogate regex even more lenient. | Josh Haberman | 2016-06-06 | 1 | -2/+2 |
| | |||||
* | JSON surrogates Python: adjust regex for OSX error message. | Josh Haberman | 2016-06-06 | 1 | -2/+2 |
| | | | | | OS X's version of Python has a slightly different error message for this error case. | ||||
* | Added test for surrogates (valid and invalid). | Josh Haberman | 2016-06-03 | 1 | -0/+21 |
| | |||||
* | Surrogate checking is unpredictable, so always manually check. | Josh Haberman | 2016-06-03 | 1 | -8/+6 |
| | |||||
* | Fixed Python by updating failure lists and fixed a few broken tests. | Josh Haberman | 2016-06-03 | 1 | -0/+10 |
| | | | | | Python 2.x doesn't detect unpaired surrogates so we have to do that manually. | ||||
* | Merge pull request #1559 from google/beta-3 | Jisi Liu | 2016-05-18 | 1 | -0/+1 |
|\ | | | | | Merge beta-3 release branch again. | ||||
| * | Added download_url to be able to upload to pypi. | Jisi Liu | 2016-05-17 | 1 | -0/+1 |
| | | |||||
* | | JSON format for Any message must print @type first, use OrderedDict instead ↵ | Jie Luo | 2016-05-17 | 2 | -1/+22 |
|/ | | | | of {} | ||||
* | Update version numbers for beta3 | Jisi Liu | 2016-05-10 | 1 | -1/+1 |
| | |||||
* | Fix using std::shared_ptr | Jisi Liu | 2016-05-05 | 5 | -5/+5 |
| | |||||
* | Fix the std::string error introduced in integration. | Jisi Liu | 2016-05-05 | 1 | -1/+1 |
| | |||||
* | Down integrate from Google internal. | Jisi Liu | 2016-04-28 | 28 | -540/+927 |
| | |||||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-04-01 | 4 | -28/+124 |
|\ | |||||
| * | Linking the cpp implementation extension statically with libprotobuf | Manjunath Kudlur | 2016-04-01 | 2 | -17/+30 |
| | | |||||
| * | Added an API to allow oversize protos when using C++ extension in Python | Manjunath Kudlur | 2016-03-31 | 2 | -11/+94 |
| | | |||||
* | | Disable sign-compare warning. | Jisi Liu | 2016-03-31 | 1 | -1/+3 |
| | | |||||
* | | Fix signed-compare warning. | Jisi Liu | 2016-03-31 | 1 | -1/+1 |
| | | |||||
* | | revert unexpected change for py26 | Jisi Liu | 2016-03-31 | 1 | -1/+4 |
| | | |||||
* | | Fix json_format.py in py26 | Jisi Liu | 2016-03-31 | 1 | -2/+4 |
| | | |||||
* | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-03-30 | 2 | -1/+2 |
|\| | |||||
| * | Merge pull request #1306 from silviulica/master | Joshua Haberman | 2016-03-07 | 1 | -1/+1 |
| |\ | | | | | | | Update version to 3.0.0b2.post2 | ||||
| | * | Update version to 3.0.0b2.post2 | Silviu Calinoiu | 2016-03-07 | 1 | -1/+1 |
| | | | |||||
| * | | Add back the namespace_packages arg in setup.py. | Craig Citro | 2016-03-05 | 1 | -0/+1 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improves #1296. The problem: in the previous patch, we tweaked the __init__.py files to use namespaces, but no longer declared ourselves as a namespace package. The second half was unwise. Note that this only comes up when installing protobuf alongside another package that also installs into the google namespace; as of right now, the only PyPI package that does is googleapis-common-protos, though the GAE SDK also uses google.appengine. Installing either or both of those alongside this package now works. The case that still remains is the upgrade path, which is also what worried me in #713. It seems that if protobuf 2.6.1 is installed, there's no way to safely upgrade that to work with a newer protobuf. However, `pip uninstall` && `pip install` does the trick. | ||||
* / | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 27 | -135/+216 |
|/ | |||||
* | Add a modified patch from craigcitro@ to handle namespace sharing. | Silviu Calinoiu | 2016-02-18 | 4 | -2/+14 |
| | |||||
* | Added PROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOS macro and setting it when | Manjunath Kudlur | 2016-02-16 | 1 | -0/+9 |
| | | | | | | --allow_oversize_protos=true is passed to bazel build. When this macro is set, SetTotalBytesLimit is called to remove the 64MB limit on binary protos when during ParseFromString. | ||||
* | Manually down-integrate python JSON struct support from internal code base. | CH Albach | 2016-01-29 | 4 | -25/+658 |
| | |||||
* | Fixed Python 3.x C++ build, and updated conformance failure lists. | Josh Haberman | 2016-01-15 | 1 | -1/+1 |
| | |||||
* | Allow conformance test runner to tolerate crashes, and re-enable conformance ↵ | Josh Haberman | 2016-01-11 | 2 | -4/+6 |
| | | | | tests. | ||||
* | Fixed compile for Python 3. There are still some crashes though. | Josh Haberman | 2015-12-30 | 3 | -91/+152 |
| | |||||
* | Require six>=1.9 for Python. | Feng Xiao | 2015-12-29 | 2 | -2/+2 |
| | | | | | | | | | We use six sub-modules that aren't available in old versions. Not specifying this requirement in the setup will lead to much less readable runtime errors. It's particuarlly problematic for Mac OSX users because the system comes with an old six version 1.4.1 by default. [skip ci] | ||||
* | Add missing files to EXTRA_DIST. | Feng Xiao | 2015-12-28 | 2 | -2/+3 |
| | | | | Also delete some unused files. | ||||
* | Disable python conformnace tests as well. | Feng Xiao | 2015-12-21 | 1 | -2/+4 |
| | | | | | | The testee program crashes on some inputs. Change-Id: Iab27b80e29b7a56c5bd7cb4724531ecf9bb2823a | ||||
* | Fix Python 2.6 test failures. | Feng Xiao | 2015-12-21 | 1 | -1/+5 |
| | | | | Change-Id: Ia9e2795b1ff1abb30410ffb3ef96ba6f46dd99d0 | ||||
* | Update version numbers. | Feng Xiao | 2015-12-21 | 1 | -1/+1 |
| | | | | | Version number for beta languages is updated to v3.0.0-beta-2. Version number for alpha languages is updated to v3.0.0-alpha-5. | ||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 35 | -1807/+3564 |
| | |||||
* | Bringing in internal::shared_ptr into google:protobuf namespace. | Manjunath Kudlur | 2015-12-09 | 6 | -0/+12 |
| | | | | Fixes #1029 | ||||
* | Updated for c++98 compatibility | Manjunath Kudlur | 2015-12-07 | 6 | -5/+12 |
| | |||||
* | Enable fast cpp protos in the python interface. | Manjunath Kudlur | 2015-12-07 | 6 | -6/+12 |
| | |||||
* | Added Python failure lists, and fixes to make sure failure propagates. | Josh Haberman | 2015-12-03 | 1 | -1/+2 |
| | |||||
* | Conformance test implementation for Python. | Josh Haberman | 2015-12-02 | 2 | -0/+9 |
| | |||||
* | Pass $CC environment variable through tox. | Josh Haberman | 2015-10-28 | 1 | -0/+1 |
| | |||||
* | Special-case Clang-only warning flags to Clang. | Josh Haberman | 2015-10-28 | 2 | -4/+4 |
| | |||||
* | Disable some more warnings to be warnings-free. | Josh Haberman | 2015-10-28 | 1 | -1/+2 |
| |