Skip to content

import either json or ujson #25

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 24, 2019
Merged

import either json or ujson #25

merged 1 commit into from
Feb 24, 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 haven’t tested though.

jerryneedell
jerryneedell reviewed Feb 24, 2019
View reviewed changes
Copy link
Contributor

@jerryneedell jerryneedell left a comment

Choose a reason for hiding this comment

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

looks good

@jerryneedell jerryneedell merged commit 271dff7 into adafruit:master Feb 24, 2019
adafruit-adabot added a commit to adafruit/Adafruit_CircuitPython_Bundle that referenced this pull request Feb 25, 2019
@adafruit-adabot
Automated update by Adabot (adafruit/adabot@eab60b0)
f10a695 
Updating https://github.com/adafruit/Adafruit_CircuitPython_ESP_ATcontrol to 0.2.3 from 0.2.2:
  > Merge pull request adafruit/Adafruit_CircuitPython_ESP_ATcontrol#27 from jerryneedell/jerryn_scan
  > Merge pull request adafruit/Adafruit_CircuitPython_ESP_ATcontrol#26 from jerryneedell/jerryn_secrets
  > Merge pull request adafruit/Adafruit_CircuitPython_ESP_ATcontrol#25 from dhalbert/ujson-to-json

Updating https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI to 1.2.2 from 1.2.1:
  > Merge pull request adafruit/Adafruit_CircuitPython_ESP32SPI#12 from ladyada/master

Updating https://github.com/adafruit/Adafruit_CircuitPython_FeatherWing to 1.7.2 from 1.7.1:
  > Merge pull request adafruit/Adafruit_CircuitPython_FeatherWing#34 from makermelissa/master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jerryneedell jerryneedell jerryneedell left review comments

@makermelissa makermelissa makermelissa approved these changes

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