Merge branch 'master' of https://github.com/Conlectus/WhoAmI

js/main.js

@@ -4,7 +4,7 @@ var BANNED_LINKS = [
 ];
 
 $(function () {
-  $.get('sites.json', function (parsed) {
+  $.getJSON('sites.json', function (parsed) {
     // Web browsers change the URL after it is added.
     var formatted = {};
 

update.py

@@ -1,6 +1,10 @@
 # I don't want to hose feedly's servers, so don't run this script too much.
 
-import urllib2
+try:
+    import urllib2 as request
+except ImportError:
+    from urllib import request
+
 import json
 
 interests = [
@@ -33,8 +37,11 @@
     print('Retreiving {}, ({} / {})'.format(interest, i + 1, len(interests)))
 
     url = 'http://feedly.com/v3/search/feeds?q='+interest+'&n=10000'
-    response = urllib2.urlopen(url)
-    results = json.load(response)['results']
+    # python 2 return str, python 3 return bytes
+    response = request.urlopen(url).read()
+    if isinstance(response, bytes):
+        response = response.decode('utf-8')
+    results = json.loads(response)['results']
 
     all_interests[interest] = []
 
@@ -55,5 +62,3 @@
 
 with open('sites.json', 'w') as output:
     output.write(json.dumps(by_url))
-
-