Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: manage JSONDecodeError exception #1574

Merged
merged 8 commits into from Oct 21, 2021
Merged

fix: manage JSONDecodeError exception #1574

merged 8 commits into from Oct 21, 2021

Conversation

gparonitti
Copy link
Contributor

@gparonitti gparonitti commented Oct 19, 2021

Fixes #1570 馃
The test copes with possible future regressions

test: copes with possible future regressions
@gparonitti gparonitti requested a review from as a code owner Oct 19, 2021
@google-cla
Copy link

@google-cla google-cla bot commented Oct 19, 2021

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

馃摑 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

鈩癸笍 Googlers: Go here for more info.

@google-cla google-cla bot added the cla: no label Oct 19, 2021
@google-cla google-cla bot added cla: yes and removed cla: no labels Oct 19, 2021
@gparonitti gparonitti changed the title fix bug #1570: manages JSONDecodeError exception fix: bug #1570 manages JSONDecodeError exception Oct 19, 2021
@tseaver tseaver changed the title fix: bug #1570 manages JSONDecodeError exception fix: manage JSONDecodeError exception Oct 19, 2021
Copy link
Contributor

@tseaver tseaver left a comment

@gparonitti Thank you for the patch!

googleapiclient/model.py Outdated Show resolved Hide resolved
tests/test_json_model.py Outdated Show resolved Hide resolved
@tseaver tseaver added the kokoro:force-run label Oct 19, 2021
test: copes with possible future regressions
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run label Oct 19, 2021
@gparonitti
Copy link
Contributor Author

@gparonitti gparonitti commented Oct 19, 2021

Pushed the requested changes on main.

@tseaver
Copy link
Contributor

@tseaver tseaver commented Oct 19, 2021

@gparonitti

Next time please make the commit message for the "fix" different (e.g., fix: address review comments). I initially thought you had force-pushed your branch.

@gparonitti
Copy link
Contributor Author

@gparonitti gparonitti commented Oct 19, 2021

@tseaver

Yes, I didn't think that it was a new commit. Sorry.

googleapiclient/model.py Outdated Show resolved Hide resolved
googleapiclient/model.py Outdated Show resolved Hide resolved
googleapiclient/model.py Outdated Show resolved Hide resolved
tests/test_json_model.py Show resolved Hide resolved
test: User passes a non-str as content
@parthea parthea added kokoro:force-run kokoro:run labels Oct 20, 2021
@yoshi-kokoro yoshi-kokoro removed kokoro:run kokoro:force-run labels Oct 20, 2021
@tseaver tseaver added the kokoro:force-run label Oct 20, 2021
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run label Oct 20, 2021
Copy link
Contributor

@tseaver tseaver left a comment

@gparonitti Thanks for persevering! Just one more change needed.

tests/test_json_model.py Outdated Show resolved Hide resolved
@tseaver tseaver added the kokoro:force-run label Oct 21, 2021
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run label Oct 21, 2021
@tseaver tseaver added the kokoro:force-run label Oct 21, 2021
@yoshi-kokoro yoshi-kokoro removed the kokoro:force-run label Oct 21, 2021
@tseaver tseaver merged commit 7d63027 into googleapis:main Oct 21, 2021
11 checks passed
gcf-merge-on-green bot pushed a commit that referenced this issue Oct 26, 2021
馃 I have created a release \*beep\* \*boop\*
---
## [2.28.0](https://www.github.com/googleapis/google-api-python-client/compare/v2.27.0...v2.28.0) (2021-10-26)


### Features

* **admin:** update the api 34eef11 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **analyticsadmin:** update the api 8666e3e ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **analyticsdata:** update the api a362e49 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **analyticsreporting:** update the api ec6bf30 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **androidpublisher:** update the api 1a6d12e ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **apigee:** update the api afc34ee ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **artifactregistry:** update the api 421f4d1 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **chat:** update the api ba90d3f ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **cloudkms:** update the api f06247e ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **containeranalysis:** update the api 1589896 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **content:** update the api 8f976a9 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **datacatalog:** update the api b7876fd ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **dataproc:** update the api 742a2f7 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **dialogflow:** update the api 117de7b ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **displayvideo:** update the api 6abb35b ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **eventarc:** update the api 5964672 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **file:** update the api 3508025 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **firestore:** update the api 851dba5 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **gkehub:** update the api b62aef0 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **iam:** update the api 50c48df ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **monitoring:** update the api eafbb60 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **notebooks:** update the api c6c8169 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **osconfig:** update the api ff7bf38 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **oslogin:** update the api c26d08f ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **playcustomapp:** update the api 1898032 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **privateca:** update the api 8eca373 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **securitycenter:** update the api 7e83274 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **speech:** update the api 1a3763c ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **storagetransfer:** update the api 0901d05 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **storage:** update the api 07237cd ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **texttospeech:** update the api 6622bd8 ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))
* **vmmigration:** update the api e29809a ([12d387c](https://www.github.com/googleapis/google-api-python-client/commit/12d387c95170487c8da93d4db25acf0bda4a2d2e))


### Bug Fixes

* manage JSONDecodeError exception ([#1574](https://www.github.com/googleapis/google-api-python-client/issues/1574)) ([7d63027](https://www.github.com/googleapis/google-api-python-client/commit/7d630270758459225f7169a03e9a6973b9e5ad82))


### Documentation

* update thread_safety.md ([#1568](https://www.github.com/googleapis/google-api-python-client/issues/1568)) ([0b400f9](https://www.github.com/googleapis/google-api-python-client/commit/0b400f97be45808ade211ca8291b2e1d9476bde1))
---


This PR was generated with [Release Please](https://github.com/googleapis/release-please). See [documentation](https://github.com/googleapis/release-please#release-please).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla: yes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants