aboutsummaryrefslogtreecommitdiff
path: root/python
Commit message (Collapse)AuthorAgeFilesLines
* A few more cases for binary conformance tests. (#2500)Joshua Haberman2017-01-061-8/+8
| | | | | | | | | | | * A few more cases for binary conformance tests. * over-encoded varints (encoded in more bytes than are necessary). * truncated varints (>32 bits for 32-bit types). * Fixed Python decoding bug with 32-bit varints. * Fixed 1L -> 1LL for 32-bit platforms.
* Factored Conformance and Benchmark test messages into shared test schema. ↵Joshua Haberman2016-12-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#1971) * Factored Conformance test messages into shared test schema. * Updated benchmarks to use new proto3 message locations. * Fixed include path. * Conformance: fixed include of Python test messages. * Make maven in Rakefile use --batch-mode. * Revert changes to benchmarks. On second thought I think a separate schema for CPU benchmarking makes sense. * Try regenerating C# protos for new test protos. * Removed benchmark messages from test proto. * Added Jon Skeet's fixes for C#. * Removed duplicate/old test messages C# file. * C# fixes for test schema move. * Fixed C# to use the correct TestAllTypes message. * Fixes for Objective C test schema move. * Added missing EXTRA_DIST file.
* Updated descriptor_pool.py to be compatible with Python 3Adam Cozzette2016-11-221-1/+1
| | | | | In Python 3 the values() method on a dictionary returns a view instead of a list, so we need to explicitly convert that to a list.
* Fixed descriptor_pool_test.py for Python 2.6Adam Cozzette2016-11-221-1/+1
| | | | | The curly brace syntax for sets was introduced in Python 2.7, and so for compatibility with 2.6 we need to avoid using it for now.
* Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-172-1/+5
|\
| * typoIan Hunter2016-11-161-1/+1
| |
| * Use -DPROTOBUF_PYTHON_ALLOW_OVERSIZE_PROTOSRichard Shin2016-10-191-0/+4
| |
* | Integrated internal changes from GoogleAdam Cozzette2016-11-1719-320/+982
|/
* Fix python_cpp test on Mac. Link staticly when building extension, so that ↵Paul Yang2016-10-101-1/+1
| | | | the extension doesn't require installing protobuf library. (#2232)
* Fix python cpp.Bo Yang2016-10-104-13/+13
|
* Update version number.Feng Xiao2016-10-101-1/+1
| | | | | | [skip ci] Change-Id: I1ba6f6372a08b5796570851336e1a548602f60da
* Fix python bugs for internal integration.Bo Yang2016-10-101-1/+1
|
* Bump version number to 3.1.0-alpha-1.Bo Yang2016-10-101-1/+1
|
* Integrate internal changesBo Yang2016-10-1033-619/+1303
|
* Merge remote-tracking branch 'origin/3.0.x' into mergeJisi Liu2016-09-141-1/+1
|\
| * Bump version number to 3.0.2Jisi Liu2016-09-021-1/+1
| |
* | Fix to typo/oversight in python testsJonathon Love2016-09-021-1/+1
| | | | | | | | Fix to typo/oversight in python tests, only affecting python 3
* | Typo: beffer -> bufferAdam Matan2016-08-031-1/+1
|/
* add setup.cfg for building wheelsJisi Liu2016-07-291-0/+2
|
* Bump version number for GAJisi Liu2016-07-251-1/+1
|
* Update version number to 3.0.0-beta-4Feng Xiao2016-07-131-1/+1
|
* Integrate from internal code base.Feng Xiao2016-07-1311-100/+82
|
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-032-4/+4
|
* Fixed string formatting in text_format.py to be Python2.6-compatibleAdam Cozzette2016-06-301-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 GoogleAdam Cozzette2016-06-2921-872/+2009
| | | | This includes all internal changes from around May 20 to now.
* Make surrogate regex even more lenient.Josh Haberman2016-06-061-2/+2
|
* JSON surrogates Python: adjust regex for OSX error message.Josh Haberman2016-06-061-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 Haberman2016-06-031-0/+21
|
* Surrogate checking is unpredictable, so always manually check.Josh Haberman2016-06-031-8/+6
|
* Fixed Python by updating failure lists and fixed a few broken tests.Josh Haberman2016-06-031-0/+10
| | | | | Python 2.x doesn't detect unpaired surrogates so we have to do that manually.
* Merge pull request #1559 from google/beta-3Jisi Liu2016-05-181-0/+1
|\ | | | | Merge beta-3 release branch again.
| * Added download_url to be able to upload to pypi.Jisi Liu2016-05-171-0/+1
| |
* | JSON format for Any message must print @type first, use OrderedDict instead ↵Jie Luo2016-05-172-1/+22
|/ | | | of {}
* Update version numbers for beta3Jisi Liu2016-05-101-1/+1
|
* Fix using std::shared_ptrJisi Liu2016-05-055-5/+5
|
* Fix the std::string error introduced in integration.Jisi Liu2016-05-051-1/+1
|
* Down integrate from Google internal.Jisi Liu2016-04-2828-540/+927
|
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-014-28/+124
|\
| * Linking the cpp implementation extension statically with libprotobufManjunath Kudlur2016-04-012-17/+30
| |
| * Added an API to allow oversize protos when using C++ extension in PythonManjunath Kudlur2016-03-312-11/+94
| |
* | Disable sign-compare warning.Jisi Liu2016-03-311-1/+3
| |
* | Fix signed-compare warning.Jisi Liu2016-03-311-1/+1
| |
* | revert unexpected change for py26Jisi Liu2016-03-311-1/+4
| |
* | Fix json_format.py in py26Jisi Liu2016-03-311-2/+4
| |
* | Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-302-1/+2
|\|
| * Merge pull request #1306 from silviulica/masterJoshua Haberman2016-03-071-1/+1
| |\ | | | | | | Update version to 3.0.0b2.post2
| | * Update version to 3.0.0b2.post2Silviu Calinoiu2016-03-071-1/+1
| | |
| * | Add back the namespace_packages arg in setup.py.Craig Citro2016-03-051-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 Liu2016-03-3027-135/+216
|/
* Add a modified patch from craigcitro@ to handle namespace sharing.Silviu Calinoiu2016-02-184-2/+14
|