From 8900c1f8af4e016dcc10aff1cb52a7dc64029106 Mon Sep 17 00:00:00 2001 From: Lee Matos Date: Wed, 5 Jul 2017 22:14:03 -0400 Subject: [PATCH] Remove urllib requirement and replace with requests --- spoilers.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/spoilers.py b/spoilers.py index cbb033e3..77c9d575 100644 --- a/spoilers.py +++ b/spoilers.py @@ -4,7 +4,6 @@ import re import os from lxml import html import datetime -import urllib import json import mtgs_scraper import xml.dom.minidom @@ -290,7 +289,7 @@ def download_images(mtgjson, setcode): if os.path.isfile('images/' + setcode + '/' + card['name'].replace(' // ', '') + '.jpg'): continue # print 'Downloading ' + card['url'] + ' to images/' + setcode + '/' + card['name'].replace(' // ','') + '.jpg' - urllib.urlretrieve(card['url'], 'images/' + setcode + + requests.get(card['url'], 'images/' + setcode + '/' + card['name'].replace(' // ', '') + '.jpg') @@ -719,13 +718,9 @@ def set_has_cards(setinfo, manual_cards, mtgjson): def get_allsets(): - class MyOpener(urllib.FancyURLopener): - version = 'Mozilla/5.0 (Windows; U; Windows NT 5.1; it; rv:1.8.1.11) Gecko / 20071127 Firefox / 2.0.0.11' - - opener = MyOpener() - opener.retrieve('http://mtgjson.com/json/AllSets.json', 'AllSets.json') - with open('AllSets.json') as data_file: - AllSets = json.load(data_file) + headers = {'user-agent': 'Mozilla/5.0 (Windows; U; Windows NT 5.1; it; rv:1.8.1.11) Gecko / 20071127 Firefox / 2.0.0.11'} + json_file = requests.get('http://mtgjson.com/json/AllSets.json', headers=headers) + AllSets = json.loads(json_file.text) return AllSets