Revert "Allow comments in JSON files"

This reverts commit 9f1b096e0c.
This commit is contained in:
tritoch 2017-06-19 13:06:40 -04:00
parent 9f1b096e0c
commit aac7664caf
4 changed files with 10 additions and 23 deletions

View File

@ -1,9 +1,2 @@
// Objects to be fixed
// "Card Name": {
// "Key": "New Value"
// }
// List of Keys:
//
{
}

View File

@ -1,9 +1 @@
// List of card strings to be removed
// [
// "Card Name 1",
// "Card Name 2"
// ]
// Case-sensitive
[
]
[]

13
main.py
View File

@ -1,8 +1,11 @@
# -*- coding: utf-8 -*-
import spoilers
import sys
import os
import commentjson
import shutil
#import configparser
import json
#import urllib
presets = {
"isfullspoil": False, #when full spoil comes around, we only want to use WOTC images
@ -14,17 +17,17 @@ presets = {
}
with open('set_info.json') as data_file:
setinfos = commentjson.load(data_file)
setinfos = json.load(data_file)
with open('cards_manual.json') as data_file:
manual_sets = commentjson.load(data_file)
manual_sets = json.load(data_file)
#manual_cards = manual_cards['cards']
with open('cards_corrections.json') as data_file:
card_corrections = commentjson.load(data_file)
card_corrections = json.load(data_file)
with open('cards_delete.json') as data_file:
delete_cards = commentjson.load(data_file)
delete_cards = json.load(data_file)
errorlog = []

View File

@ -3,5 +3,4 @@ feedparser
lxml
Pillow
datetime
beautifulsoup4
commentjson
beautifulsoup4