Merge branch 'master' into split-cards-and-xml-dump

cards_corrections

@@ -1,3 +1,10 @@
+// Objects to be fixed
+// "Card Name": {
+//   "Key": "New Value"
+// }
+// List of Keys:
+//
+
 {
   "Angel of the God-Pharoh": {
     "name": "Angel of the God-Pharaoh",

cards_delete

@@ -0,0 +1,10 @@
+// List of card strings to be removed
+// [
+//   "Card Name 1",
+//   "Card Name 2"
+// ]
+// Case-sensitive
+
+[
+  "Sunset Pyramid (TO DELETE)"
+]

cards_delete.json

@@ -1 +0,0 @@
-["Sunset Pyramid (TO DELETE)"]

main.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import spoilers
 import os
+import commentjson
 import json
 
 presets = {
@@ -15,17 +16,17 @@ presets = {
     "dumpXML": True # let travis print XML for testing
 }
 
-with open('set_info.json') as data_file:
-    setinfos = json.load(data_file)
+with open('set_info') as data_file:
+    setinfos = commentjson.load(data_file)
 
 with open('cards_manual.json') as data_file:
     manual_sets = json.load(data_file)
 
-with open('cards_corrections.json') as data_file:
-    card_corrections = json.load(data_file)
+with open('cards_corrections') as data_file:
+    card_corrections = commentjson.load(data_file)
 
-with open('cards_delete.json') as data_file:
-    delete_cards = json.load(data_file)
+with open('cards_delete') as data_file:
+    delete_cards = commentjson.load(data_file)
 
 errorlog = []
 
@@ -108,4 +109,3 @@ if __name__ == '__main__':
         with open('out/spoiler.xml', 'r') as xmlfile:
             print xmlfile.read()
         print '----- END XML DUMP -----'
-

requirements.txt

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