From aac7664cafefde9024eb466bbeceed1d21a8ac66 Mon Sep 17 00:00:00 2001
From: tritoch <tritochs@gmail.com>
Date: Mon, 19 Jun 2017 13:06:40 -0400
Subject: [PATCH] Revert "Allow comments in JSON files"

This reverts commit 9f1b096e0c035b66d21da2e14acca8e7819cf62e.
---
 cards_corrections.json |  7 -------
 cards_delete.json      | 10 +---------
 main.py                | 13 ++++++++-----
 requirements.txt       |  3 +--
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/cards_corrections.json b/cards_corrections.json
index 25ef57c2..7a73a41b 100644
--- a/cards_corrections.json
+++ b/cards_corrections.json
@@ -1,9 +1,2 @@
-// Objects to be fixed
-// "Card Name": {
-//   "Key": "New Value"
-// }
-// List of Keys:
-//
-
 {
 }
\ No newline at end of file
diff --git a/cards_delete.json b/cards_delete.json
index 509ff735..fe51488c 100644
--- a/cards_delete.json
+++ b/cards_delete.json
@@ -1,9 +1 @@
-// List of card strings to be removed
-// [
-//   "Card Name 1",
-//   "Card Name 2"
-// ]
-// Case-sensitive
-
-[
-]
\ No newline at end of file
+[]
diff --git a/main.py b/main.py
index fa32421b..ed4791b9 100644
--- a/main.py
+++ b/main.py
@@ -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 = []
 
diff --git a/requirements.txt b/requirements.txt
index 09b173ce..f053885b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,5 +3,4 @@ feedparser
 lxml
 Pillow
 datetime
-beautifulsoup4
-commentjson
\ No newline at end of file
+beautifulsoup4
\ No newline at end of file