Skip to content

Revert merge conflict issues #69

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

Merged
cereallarceny merged 1 commit into from
Dec 28, 2019
Merged

Revert merge conflict issues #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/serde.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const SIMPLIFY_REPLACERS = [
export const DETAIL_REPLACERS = [
[/\(/g, '['], // Convert all Python tuples into a Javascript Array
[/\)/g, ']'],
[/b'(.*?)'/g, "'$1'"], // Convert all undefined 'b' functions everywhere, remove them
[/b'/g, "'"], // Convert all undefined 'b' functions everywhere, remove them
[/'/g, '"'], // Convert all single quotes to double quotes so JSON can parse correctly
[/None/g, null], // Convert all Nones to nulls
[/False/g, false], // Convert all False to false
Expand Down