github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-02-03 19:25:01 -05:00
Code Issues Packages Projects Releases Wiki Activity

Use HTTPS for all communication with embedly.

Browse Source
This commit is contained in:
Neil Williams
2013-09-05 12:05:30 -07:00
parent 88bac49402
commit 3962494ab8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
r2/r2/lib/media.py
View File

@@ -39,6 +39,7 @@ import urlparse
import BeautifulSoup
import Image
import ImageFile
import requests
from pylons import g
@@ -443,7 +444,7 @@ class _ThumbnailOnlyScraper(Scraper):
class _EmbedlyScraper(Scraper):
EMBEDLY_API_URL = "http://api.embed.ly/1/oembed"
EMBEDLY_API_URL = "https://api.embed.ly/1/oembed"
def __init__(self, url):
self.url = url
@@ -469,8 +470,8 @@ class _EmbedlyScraper(Scraper):
"maxwidth": 600,
"key": g.embedly_api_key,
})
response = urllib2.urlopen(self.EMBEDLY_API_URL + "?" + params)
oembed = json.load(response, object_hook=self._utf8_encode)
content = requests.get(self.EMBEDLY_API_URL + "?" + params).content
oembed = json.loads(content, object_hook=self._utf8_encode)
if not oembed:
return None, None
@@ -509,8 +510,7 @@ class _EmbedlyScraper(Scraper):
@memoize("media.embedly_services", time=3600)
def _fetch_embedly_services():
response = urllib2.urlopen("http://api.embed.ly/1/services/python")
service_data = json.load(response)
service_data = requests.get("https://api.embed.ly/1/services/python").json
patterns_by_domain = collections.defaultdict(set)
for service in service_data: