Merge remote-tracking branch 'theguardian/master' into develop

This commit is contained in:
rembo10
2015-12-01 10:05:51 -08:00

View File

@@ -18,6 +18,7 @@ from headphones import logger
from xml.dom import minidom
from bs4 import BeautifulSoup
import sys
import requests
import feedparser
import headphones
@@ -54,6 +55,14 @@ def request_response(url, method="get", auto_raise=True,
# pose a security issue!
kwargs["verify"] = bool(headphones.CONFIG.VERIFY_SSL_CERT)
#This fix is put in place for systems with broken SSL (like QNAP)
if not headphones.CONFIG.VERIFY_SSL_CERT and sys.version_info >= (2, 7, 9):
try:
import ssl
ssl._create_default_https_context = ssl._create_unverified_context
except:
pass
# Map method to the request.XXX method. This is a simple hack, but it
# allows requests to apply more magic per method. See lib/requests/api.py.
request_method = getattr(requests, method.lower())