import either json or ujson #10
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
makermelissa
approved these changes
Feb 21, 2019
|
Ok tested good. It looks like it's working. |
adafruit-adabot
added a commit
to adafruit/Adafruit_CircuitPython_Bundle
that referenced
this pull request
Feb 22, 2019
Updating https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI to 1.2.1 from 1.2.0: > Merge pull request adafruit/Adafruit_CircuitPython_ESP32SPI#10 from dhalbert/ujson-to-json Updating https://github.com/adafruit/Adafruit_CircuitPython_IS31FL3731 to 2.3.0 from 2.2.2: > Merge pull request adafruit/Adafruit_CircuitPython_IS31FL3731#13 from ladyada/master Updating https://github.com/adafruit/Adafruit_CircuitPython_MCP230xx to 1.2.0 from 1.1.2: > Merge pull request adafruit/Adafruit_CircuitPython_MCP230xx#7 from ladyada/master Updating https://github.com/adafruit/Adafruit_CircuitPython_Seesaw to 1.3.0 from 1.2.7: > Merge pull request adafruit/Adafruit_CircuitPython_seesaw#24 from caternuson/iss23 Updating https://github.com/adafruit/Adafruit_CircuitPython_BluefruitConnect to 1.0.8 from 1.0.7: > Merge pull request adafruit/Adafruit_CircuitPython_BluefruitConnect#10 from dhalbert/robust-packet-reading
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We're renaming
ujsontojsonin 4.0.0. Tries to import json parser as eitherjsonorujsonfor upward compatibility. Renames import tojson_moduleto avoid conflicts with variables namedjson.