Skip to content

import either json or ujson #10

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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Feb 22, 2019
Merged

import either json or ujson #10

merged 1 commit into from
Feb 22, 2019

Conversation

dhalbert
Copy link
Contributor

We're renaming ujson to json in 4.0.0. Tries to import json parser as either json or ujson for upward compatibility. Renames import to json_module to avoid conflicts with variables named json.

makermelissa
makermelissa approved these changes Feb 21, 2019
View reviewed changes
Copy link
Collaborator

@makermelissa makermelissa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code looks good. I won’t be able to actually test until tonight though.

@makermelissa
Copy link
Collaborator

Ok tested good. It looks like it's working.

@jerryneedell jerryneedell merged commit 08c1726 into adafruit:master Feb 22, 2019
adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Feb 22, 2019
@adafruit-adabot
Automated update by Adabot (adafruit/adabot@56a4f43)
3443c73 
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
@dhalbert dhalbert deleted the ujson-to-json branch May 28, 2022 12:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@makermelissa makermelissa makermelissa approved these changes

@jerryneedell jerryneedell Awaiting requested review from jerryneedell

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dhalbert @makermelissa @jerryneedell