Upgrade from python 2 to 3.

scripts/future-fetch.py

@@ -1,11 +1,11 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # encoding: utf-8
 
 import json
 import os
 import sys
 import re
-import urllib2
+import urllib.request
 import MySQLdb
 
 import datetime
@@ -32,7 +32,7 @@
 
 def fetch_url(date):
     data = CALENDAR_BASE % {'date': date}
-    data = urllib2.urlopen(data)
+    data = urllib.request.urlopen(data)
     data = json.load(data)
     return data
 
@@ -272,7 +272,7 @@ def update(self):
         if old_tuple != new_tuple:
             new_entry.update()
 
-        old_entries.discard((long(id),))
+        old_entries.discard((int(id),))
     else:
         new_entry.add()
 

scripts/photo-attribution-import.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python3
 # encoding: utf-8
 
 import json
@@ -31,13 +31,13 @@
 )
 db_cursor = db_connection.cursor()
 
-data_blank = filter(lambda r: not r["data_value"], data)
-data_blank = map(lambda r: (r["person_id"], r["data_key"]), data_blank)
+data_blank = [r for r in data if not r["data_value"]]
+data_blank = [(r["person_id"], r["data_key"]) for r in data_blank]
 db_cursor.executemany("""DELETE FROM personinfo
     WHERE person_id=%s AND data_key=%s""", data_blank)
 
-data = filter(lambda r: r["data_value"], data)
-data = map(lambda r: (r["person_id"], r["data_key"], r["data_value"]), data)
+data = [r for r in data if r["data_value"]]
+data = [(r["person_id"], r["data_key"], r["data_value"]) for r in data]
 db_cursor.executemany("""INSERT INTO personinfo
     (person_id, data_key, data_value) VALUES (%s, %s, %s)
     ON DUPLICATE KEY UPDATE data_value = VALUES(data_value)""", data)