diff --git a/granary/atom.py b/granary/atom.py
index 0888b2d8..1f9aa019 100644
--- a/granary/atom.py
+++ b/granary/atom.py
@@ -6,7 +6,7 @@
 import collections
 import os
 import re
-import urlparse
+import urllib.parse
 import xml.sax.saxutils
 
 import jinja2
@@ -14,8 +14,8 @@
 import mf2util
 from oauth_dropins.webutil import util
 
-import microformats2
-import source
+from . import microformats2
+from . import source
 
 ATOM_TEMPLATE_FILE = 'user_feed.atom'
 # stolen from django.utils.html
@@ -87,10 +87,10 @@ class Defaulter(collections.defaultdict):
     def __init__(self, **kwargs):
       super(Defaulter, self).__init__(Defaulter, **{
         k: (Defaulter(**v) if isinstance(v, dict) else v)
-        for k, v in kwargs.items()})
+        for k, v in list(kwargs.items())})
 
     def __unicode__(self):
-      return super(Defaulter, self).__unicode__() if self else u''
+      return super(Defaulter, self).__unicode__() if self else ''
 
   env = jinja2.Environment(loader=jinja2.PackageLoader(__package__, 'templates'),
                            autoescape=True)
@@ -127,6 +127,6 @@ def html_to_atom(html, url=None, **kwargs):
 
 
 def _remove_query_params(url):
-  parsed = list(urlparse.urlparse(url))
+  parsed = list(urllib.parse.urlparse(url))
   parsed[4] = ''
-  return urlparse.urlunparse(parsed)
+  return urllib.parse.urlunparse(parsed)
diff --git a/granary/facebook.py b/granary/facebook.py
index 90fe09fb..c638b644 100644
--- a/granary/facebook.py
+++ b/granary/facebook.py
@@ -48,14 +48,14 @@
 import json
 import logging
 import re
-import urllib
-import urllib2
-import urlparse
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
+import urllib.parse
 import mf2util
 
-import appengine_config
+from . import appengine_config
 from oauth_dropins.webutil import util
-import source
+from . import source
 
 # Since API v2.4, we need to explicitly ask for the fields we want from most API
 # endpoints with ?fields=...
@@ -166,11 +166,11 @@
   'rsvp-interested': API_PUBLISH_RSVP_INTERESTED,
 }
 REACTION_CONTENT = {
-  'LOVE': u'❤️',
-  'WOW': u'😮',
-  'HAHA': u'😆',
-  'SAD': u'😢',
-  'ANGRY': u'😡',
+  'LOVE': '❤️',
+  'WOW': '😮',
+  'HAHA': '😆',
+  'SAD': '😢',
+  'ANGRY': '😡',
   # nothing for LIKE (it's a like :P) or for NONE
 }
 
@@ -286,7 +286,7 @@ def get_activities_response(self, user_id=None, group_id=None, app_id=None,
         resp = self.urlopen(url, headers=headers, _as=None)
         etag = resp.info().get('ETag')
         posts = self._as(list, json.loads(resp.read()))
-      except urllib2.HTTPError, e:
+      except urllib.error.HTTPError as e:
         if e.code == 304:  # Not Modified, from a matching ETag
           posts = []
         else:
@@ -334,7 +334,7 @@ def get_activities_response(self, user_id=None, group_id=None, app_id=None,
       # some sharedposts requests 400, not sure why.
       # https://github.com/snarfed/bridgy/issues/348
       with util.ignore_http_4xx_error():
-        for id, shares in self._split_id_requests(API_SHARES, fetch_shares_ids).items():
+        for id, shares in list(self._split_id_requests(API_SHARES, fetch_shares_ids).items()):
           activity = id_to_activity.get(id)
           if activity:
             activity['object'].setdefault('tags', []).extend(
@@ -343,8 +343,8 @@ def get_activities_response(self, user_id=None, group_id=None, app_id=None,
     if fetch_replies and fetch_comments_ids:
       # some comments requests 400, not sure why.
       with util.ignore_http_4xx_error():
-        for id, comments in self._split_id_requests(API_COMMENTS_ALL,
-                                                    fetch_comments_ids).items():
+        for id, comments in list(self._split_id_requests(API_COMMENTS_ALL,
+                                                    fetch_comments_ids).items()):
           activity = id_to_activity.get(id)
           if activity:
             replies = activity['object'].setdefault('replies', {}
@@ -408,7 +408,7 @@ def _merge_photos(self, posts):
         photo['privacy'] = 'custom'  # ie unknown
 
     return ([p for p in posts if not p.get('object_id')] +
-            posts_by_obj_id.values() + photos)
+            list(posts_by_obj_id.values()) + photos)
 
   def _split_id_requests(self, api_call, ids):
     """Splits an API call into multiple to stay under the MAX_IDS limit per call.
@@ -424,7 +424,7 @@ def _split_id_requests(self, api_call, ids):
     results = {}
     for i in range(0, len(ids), MAX_IDS):
       resp = self.urlopen(api_call % ','.join(ids[i:i + MAX_IDS]))
-      for id, objs in resp.items():
+      for id, objs in list(resp.items()):
         # objs is usually a dict but sometimes a boolean. (oh FB, never change!)
         results.setdefault(id, []).extend(self._as(dict, objs).get('data', []))
 
@@ -486,7 +486,7 @@ def get_comment(self, comment_id, activity_id=None, activity_author_id=None,
     """
     try:
       resp = self.urlopen(API_COMMENT % comment_id)
-    except urllib2.HTTPError, e:
+    except urllib.error.HTTPError as e:
       if e.code == 400 and '_' in comment_id:
         # Facebook may want us to ask for this without the other prefixed id(s)
         resp = self.urlopen(API_COMMENT % comment_id.split('_')[-1])
@@ -636,7 +636,7 @@ def _create(self, obj, preview=None, include_link=source.OMIT_LINK,
 
     name = obj.get('displayName')
     if name and mf2util.is_name_a_title(name, content):
-        content = name + u"\n\n" + content
+        content = name + "\n\n" + content
 
     people = self._get_person_tags(obj)
 
@@ -677,7 +677,7 @@ def _create(self, obj, preview=None, include_link=source.OMIT_LINK,
         if image_url:
           msg_data['attachment_url'] = image_url
         resp = self.urlopen(API_PUBLISH_COMMENT % base_id,
-                            data=urllib.urlencode(msg_data))
+                            data=urllib.parse.urlencode(msg_data))
         url = self.comment_url(base_id, resp['id'],
                                post_author_id=base_obj.get('author', {}).get('id'))
         resp.update({'url': url, 'type': 'comment'})
@@ -772,7 +772,7 @@ def _create(self, obj, preview=None, include_link=source.OMIT_LINK,
             # https://developers.facebook.com/docs/graph-api/reference/user/feed#pubfields
             msg_data['tags'] = ','.join(tag['id'] for tag in people)
 
-        resp = self.urlopen(api_call, data=urllib.urlencode(msg_data))
+        resp = self.urlopen(api_call, data=urllib.parse.urlencode(msg_data))
         resp.update({'url': self.post_url(resp), 'type': 'post'})
         if video_url and not resp.get('success', True):
           msg = 'Video upload failed.'
@@ -817,7 +817,7 @@ def _get_person_tags(self, obj):
         tag['id'] = id
         people[id] = tag
 
-    return people.values()
+    return list(people.values())
 
   def create_notification(self, user_id, text, link):
     """Sends the authenticated user a notification.
@@ -843,7 +843,7 @@ def create_notification(self, user_id, text, link):
                                  appengine_config.FACEBOOK_APP_SECRET),
       }
     url = API_BASE + API_NOTIFICATION % user_id
-    resp = util.urlopen(urllib2.Request(url, data=urllib.urlencode(params)))
+    resp = util.urlopen(urllib.request.Request(url, data=urllib.parse.urlencode(params)))
     logging.debug('Response: %s %s', resp.getcode(), resp.read())
 
   def post_url(self, post):
@@ -904,8 +904,8 @@ def base_object(self, obj, verb=None, resolve_numeric_id=False):
         base_obj = self.user_to_actor(self.urlopen(base_id))
 
     try:
-      parsed = urlparse.urlparse(url)
-      params = urlparse.parse_qs(parsed.query)
+      parsed = urllib.parse.urlparse(url)
+      params = urllib.parse.parse_qs(parsed.query)
       assert parsed.path.startswith('/')
       path = parsed.path.strip('/')
       path_parts = path.split('/')
@@ -920,7 +920,7 @@ def base_object(self, obj, verb=None, resolve_numeric_id=False):
         # populate image, displayName, etc.
         if not base_obj.get('username') and not util.is_int(base_id):
           base_obj['username'] = base_id
-        base_obj.update({k: v for k, v in self.user_to_actor(base_obj).items()
+        base_obj.update({k: v for k, v in list(self.user_to_actor(base_obj).items())
                          if k not in base_obj})
 
       elif len(path_parts) >= 3 and path_parts[1] == 'posts':
@@ -955,7 +955,7 @@ def base_object(self, obj, verb=None, resolve_numeric_id=False):
         # add author user id prefix. https://github.com/snarfed/bridgy/issues/229
         base_obj['id'] = '%s_%s' % (author['numeric_id'], base_id)
 
-    except BaseException, e:
+    except BaseException as e:
       logging.error(
         "Couldn't parse object URL %s : %s. Falling back to default logic.",
         url, e)
@@ -1074,7 +1074,7 @@ def post_to_object(self, post, is_comment=False):
     # types, e.g. comments.
     message_tags = post.get('message_tags', [])
     if isinstance(message_tags, dict):
-      message_tags = sum(message_tags.values(), [])  # flatten
+      message_tags = sum(list(message_tags.values()), [])  # flatten
     elif not isinstance(message_tags, list):
       message_tags = list(message_tags)  # fingers crossed! :P
 
@@ -1366,7 +1366,7 @@ def event_to_object(self, event, rsvps=None):
       for rsvp in event.get(field, {}).get('data', []):
         rsvp = self.rsvp_to_object(rsvp, type=field, event=event)
         id_to_rsvp[rsvp['id']] = rsvp
-    self.add_rsvps_to_event(obj, id_to_rsvp.values())
+    self.add_rsvps_to_event(obj, list(id_to_rsvp.values()))
 
     return self.postprocess_object(obj)
 
@@ -1684,7 +1684,7 @@ def urlopen(self, url, _as=dict, **kwargs):
     log_url = url
     if self.access_token:
       url = util.add_query_params(url, [('access_token', self.access_token)])
-    resp = util.urlopen(urllib2.Request(url, **kwargs))
+    resp = util.urlopen(urllib.request.Request(url, **kwargs))
 
     if _as is None:
       return resp
@@ -1745,7 +1745,7 @@ def urlopen_batch(self, urls):
       code = int(resp.get('code', 0))
       body = resp.get('body')
       if code / 100 in (4, 5):
-        raise urllib2.HTTPError(url, code, body, resp.get('headers'), None)
+        raise urllib.error.HTTPError(url, code, body, resp.get('headers'), None)
       bodies.append(body)
 
     return bodies
@@ -1786,7 +1786,7 @@ def urlopen_batch_full(self, requests):
         req['method'] = 'GET'
       if 'headers' in req:
         req['headers'] = [{'name': n, 'value': v}
-                          for n, v in req['headers'].items()]
+                          for n, v in list(req['headers'].items())]
 
     data = 'batch=' + json.dumps(util.trim_nulls(requests),
                                  separators=(',', ':'))  # no whitespace
diff --git a/granary/flickr.py b/granary/flickr.py
index 66cda78c..cfc3a9bf 100644
--- a/granary/flickr.py
+++ b/granary/flickr.py
@@ -20,14 +20,14 @@
 import json
 import logging
 import requests
-import source
+from . import source
 import sys
 import mf2py
 import mf2util
-import urllib2
-import urlparse
+import urllib.request, urllib.error, urllib.parse
+import urllib.parse
 
-import appengine_config
+from . import appengine_config
 from oauth_dropins.webutil import util
 from oauth_dropins import flickr_auth
 
@@ -312,7 +312,7 @@ def _get_person_tags(self, obj):
           tag = copy.copy(tag)
           tag['id'] = id
           people[id] = tag
-    return people.values()
+    return list(people.values())
 
   def get_activities_response(self, user_id=None, group_id=None, app_id=None,
                               activity_id=None, start_index=0, count=0,
@@ -442,7 +442,7 @@ def user_to_actor(self, resp):
         obj['url'] = next(
           (u for u in urls if not u.startswith('https://www.flickr.com/')),
           None)
-      except urllib2.URLError, e:
+      except urllib.error.URLError as e:
         logging.warning('could not fetch user homepage %s', profile_url)
 
     return self.postprocess_object(obj)
@@ -512,7 +512,7 @@ def photo_to_activity(self, photo):
         'url': photo_permalink,
         'id': self.tag_uri(photo.get('id')),
         'image': {
-          'url': u'https://farm{}.staticflickr.com/{}/{}_{}_{}.jpg'.format(
+          'url': 'https://farm{}.staticflickr.com/{}/{}_{}_{}.jpg'.format(
             photo.get('farm'), photo.get('server'),
             photo.get('id'), photo.get('secret'), 'b'),
         },
@@ -555,14 +555,14 @@ def photo_to_activity(self, photo):
       activity['object']['tags'] = [{
           'objectType': 'hashtag',
           'id': self.tag_uri(tag.get('id')),
-          'url': u'https://www.flickr.com/search?tags={}'.format(
+          'url': 'https://www.flickr.com/search?tags={}'.format(
             tag.get('_content')),
           'displayName': tag.get('raw'),
         } for tag in photo.get('tags', {}).get('tag', [])]
-    elif isinstance(photo.get('tags'), basestring):
+    elif isinstance(photo.get('tags'), str):
       activity['object']['tags'] = [{
         'objectType': 'hashtag',
-        'url': u'https://www.flickr.com/search?tags={}'.format(
+        'url': 'https://www.flickr.com/search?tags={}'.format(
           tag.strip()),
         'displayName': tag.strip(),
       } for tag in photo.get('tags').split(' ') if tag.strip()]
@@ -606,10 +606,10 @@ def like_to_object(self, person, photo_activity):
         },
       },
       'created': util.maybe_timestamp_to_rfc3339(photo_activity.get('favedate')),
-      'url': u'{}#liked-by-{}'.format(
+      'url': '{}#liked-by-{}'.format(
         photo_activity.get('url'), person.get('nsid')),
       'object': {'url': photo_activity.get('url')},
-      'id': self.tag_uri(u'{}_liked_by_{}'.format(
+      'id': self.tag_uri('{}_liked_by_{}'.format(
         photo_activity.get('flickr_id'), person.get('nsid'))),
       'objectType': 'activity',
       'verb': 'like',
@@ -656,8 +656,8 @@ def get_user_image(self, farm, server, author):
     ref: https://www.flickr.com/services/api/misc.buddyicons.html
     """
     if server == 0:
-      return u'https://www.flickr.com/images/buddyicon.gif'
-    return u'https://farm{}.staticflickr.com/{}/buddyicons/{}.jpg'.format(
+      return 'https://www.flickr.com/images/buddyicon.gif'
+    return 'https://farm{}.staticflickr.com/{}/buddyicons/{}.jpg'.format(
       farm, server, author)
 
   def user_id(self):
@@ -710,13 +710,13 @@ def photo_url(self, user_id, photo_id):
     Returns:
       string, the photo URL
     """
-    return u'https://www.flickr.com/photos/%s/%s/' % (user_id, photo_id)
+    return 'https://www.flickr.com/photos/%s/%s/' % (user_id, photo_id)
 
   @classmethod
   def post_id(cls, url):
     """Used when publishing comments or favorites. Flickr photo ID is the
     3rd path component rather than the first.
     """
-    parts = urlparse.urlparse(url).path.split('/')
+    parts = urllib.parse.urlparse(url).path.split('/')
     if len(parts) >= 4 and parts[1] == 'photos':
       return parts[3]
diff --git a/granary/googleplus.py b/granary/googleplus.py
index 4a2d5ec0..95e606dd 100644
--- a/granary/googleplus.py
+++ b/granary/googleplus.py
@@ -13,8 +13,8 @@
 import json
 import re
 
-import appengine_config
-import source
+from . import appengine_config
+from . import source
 
 from apiclient.errors import HttpError
 from apiclient.http import BatchHttpRequest
@@ -128,7 +128,7 @@ def request_with_etag(*args, **kwargs):
         resp = call.execute(http)
         activities = resp.get('items', [])
         etag = resp.get('etag')
-    except HttpError, e:
+    except HttpError as e:
       if e.resp.status == 304:  # Not Modified, from a matching ETag
         activities = []
       else:
@@ -328,7 +328,7 @@ def html_to_activities(self, html):
       html = re.sub(r'([,[])\s*([],])', r'\1null\2', html)
 
     data = json.loads(html)[1][7][1:]
-    data = [d[6].values()[0] for d in data if len(d) >= 7 and d[6]]
+    data = [list(d[6].values())[0] for d in data if len(d) >= 7 and d[6]]
 
     activities = []
     for d in data:
@@ -392,7 +392,7 @@ def html_to_activities(self, html):
           'image': {'url': att[1]},
           'displayName': att[2],
           'content': att[3],
-         } for att in attachments.values()]
+         } for att in list(attachments.values())]
 
       self.postprocess_object(activity['object'])
       activities.append(super(GooglePlus, self).postprocess_activity(activity))
diff --git a/granary/instagram.py b/granary/instagram.py
index 054ce2dd..6845d364 100644
--- a/granary/instagram.py
+++ b/granary/instagram.py
@@ -15,15 +15,15 @@
 import operator
 import re
 import string
-import urllib
-import urllib2
-import urlparse
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
+import urllib.parse
 import xml.sax.saxutils
 
-import appengine_config
+from . import appengine_config
 from oauth_dropins.webutil import util
 import requests
-import source
+from . import source
 
 # Maps Instagram media type to ActivityStreams objectType.
 OBJECT_TYPES = {'image': 'photo', 'video': 'video'}
@@ -91,7 +91,7 @@ def urlopen(self, url, **kwargs):
     if self.access_token:
       # TODO add access_token to the data parameter for POST requests
       url = util.add_query_params(url, [('access_token', self.access_token)])
-    resp = util.urlopen(urllib2.Request(url, **kwargs))
+    resp = util.urlopen(urllib.request.Request(url, **kwargs))
     return resp if kwargs.get('data') else json.loads(resp.read()).get('data')
 
   @classmethod
@@ -210,7 +210,7 @@ def get_activities_response(self, user_id=None, group_id=None, app_id=None,
           activities += [self.like_to_object(user, l['id'], l['link'])
                          for l in liked]
 
-    except urllib2.HTTPError, e:
+    except urllib.error.HTTPError as e:
       code, body = util.interpret_http_exception(e)
       # instagram api should give us back a json block describing the
       # error. but if it's an error for some other reason, it probably won't
@@ -403,7 +403,7 @@ def _create(self, obj, include_link=source.OMIT_LINK, preview=None,
           description='<span class="verb">comment</span> on <a href="%s">'
                       'this post</a>:\n%s' % (base_url, self.embed_post(base_obj)))
 
-      self.urlopen(API_COMMENT_URL % base_id, data=urllib.urlencode({
+      self.urlopen(API_COMMENT_URL % base_id, data=urllib.parse.urlencode({
         'access_token': self.access_token,
         'text': content,
       }))
@@ -437,7 +437,7 @@ def _create(self, obj, include_link=source.OMIT_LINK, preview=None,
       logging.info('posting like for media id id=%s, url=%s',
                    base_id, base_url)
       # no response other than success/failure
-      self.urlopen(API_MEDIA_LIKES_URL % base_id, data=urllib.urlencode({
+      self.urlopen(API_MEDIA_LIKES_URL % base_id, data=urllib.parse.urlencode({
         'access_token': self.access_token
       }))
       # TODO use the stored user_json rather than looking it up each time.
@@ -507,14 +507,14 @@ def media_to_object(self, media):
         # ActivityStreams 2.0 allows image to be a JSON array.
         # http://jasnell.github.io/w3c-socialwg-activitystreams/activitystreams2.html#link
         'image': sorted(
-          media.get('images', {}).values(),
+          list(media.get('images', {}).values()),
           # sort by size, descending, since atom.py
           # uses the first image in the list.
           key=operator.itemgetter('width'), reverse=True),
         # video object defined in
         # http://activitystrea.ms/head/activity-schema.html#rfc.section.4.18
         'stream': sorted(
-          media.get('videos', {}).values(),
+          list(media.get('videos', {}).values()),
           key=operator.itemgetter('width'), reverse=True),
       }],
       # comments go in the replies field, according to the "Responses for
@@ -682,7 +682,7 @@ def id_to_shortcode(id):
     if not id:
       return None
 
-    if isinstance(id, basestring):
+    if isinstance(id, str):
       parts = id.split('_')
       if not util.is_int(parts[0]):
         return id
diff --git a/granary/microformats2.py b/granary/microformats2.py
index ac5259ee..864fae77 100644
--- a/granary/microformats2.py
+++ b/granary/microformats2.py
@@ -7,7 +7,7 @@
 import copy
 import itertools
 import logging
-import urlparse
+import urllib.parse
 import string
 import re
 import xml.sax.saxutils
@@ -15,7 +15,7 @@
 import mf2py
 import mf2util
 from oauth_dropins.webutil import util
-import source
+from . import source
 
 HENTRY = string.Template("""\
 <article class="$types">
@@ -61,7 +61,7 @@ def get_string_urls(objs):
   """
   urls = []
   for item in objs:
-    if isinstance(item, basestring):
+    if isinstance(item, str):
       urls.append(item)
     else:
       itemtype = [x for x in item.get('type', []) if x.startswith('h-')]
@@ -258,7 +258,7 @@ def json_to_object(mf2):
   def absolute_urls(prop):
     return [{'url': url} for url in get_string_urls(props.get(prop, []))
             # filter out relative and invalid URLs (mf2py gives absolute urls)
-            if urlparse.urlparse(url).netloc]
+            if urllib.parse.urlparse(url).netloc]
 
   urls = props.get('url') and get_string_urls(props.get('url'))
 
@@ -278,7 +278,7 @@ def absolute_urls(prop):
     'location': json_to_object(prop.get('location')),
     'replies': {'items': [json_to_object(c) for c in props.get('comment', [])]},
     'tags': [{'objectType': 'hashtag', 'displayName': cat}
-             if isinstance(cat, basestring)
+             if isinstance(cat, str)
              else json_to_object(cat)
              for cat in props.get('category', [])],
   }
@@ -425,7 +425,7 @@ def json_to_html(obj, parent_props=None):
   for mftype in ['like', 'repost']:
     # having like-of or repost-of makes this a like or repost.
     for target in props.get(mftype + '-of', []):
-      if isinstance(target, basestring):
+      if isinstance(target, str):
         children.append('<a class="u-%s-of" href="%s"></a>' % (mftype, target))
       else:
         children.append(json_to_html(target, ['u-' + mftype + '-of']))
@@ -641,7 +641,7 @@ def render_content(obj, include_location=True, synthesize_content=True):
             target.get('url', '#'), author.get('username'))
         else:
           # image looks bad in the simplified rendering
-          author = {k: v for k, v in author.iteritems() if k != 'image'}
+          author = {k: v for k, v in author.items() if k != 'image'}
           content += '%s <a href="%s">%s</a> by %s' % (
             verb, target.get('url', '#'),
             target.get('displayName', target.get('title', 'a post')),
@@ -668,7 +668,7 @@ def render_content(obj, include_location=True, synthesize_content=True):
   # render the rest
   content += tags_to_html(tags.pop('hashtag', []), 'p-category')
   content += tags_to_html(tags.pop('mention', []), 'u-mention')
-  content += tags_to_html(sum(tags.values(), []), 'tag')
+  content += tags_to_html(sum(list(tags.values()), []), 'tag')
 
   return content
 
diff --git a/granary/source.py b/granary/source.py
index 3ec94c84..72e417a1 100644
--- a/granary/source.py
+++ b/granary/source.py
@@ -17,13 +17,13 @@
 import logging
 import mimetypes
 import re
-import urlparse
+import urllib.parse
 import html2text
 
 from bs4 import BeautifulSoup
 import requests
 
-import appengine_config
+from . import appengine_config
 from oauth_dropins.webutil import util
 
 ME = '@me'
@@ -132,7 +132,7 @@ def __new__(meta, name, bases, class_dict):
     return cls
 
 
-class Source(object):
+class Source(object, metaclass=SourceMeta):
   """Abstract base class for a source (e.g. Facebook, Twitter).
 
   Concrete subclasses must override the class constants below and implement
@@ -148,7 +148,6 @@ class Source(object):
       placeholder for the post URL and (optionally) a %(content)s placeholder
       for the post content.
   """
-  __metaclass__ = SourceMeta
 
   RESPONSE_CACHE_TIME = 5 * 60  # 5m
 
@@ -561,10 +560,9 @@ def original_post_discovery(activity, domains=None, cache=None,
     candidates += [match.expand(r'http://\1/\2') for match in
                    Source._PERMASHORTCITATION_RE.finditer(content)]
 
-    candidates = set(filter(None,
-      (util.clean_url(url) for url in candidates
+    candidates = set([_f for _f in (util.clean_url(url) for url in candidates
        # heuristic: ellipsized URLs are probably incomplete, so omit them.
-       if url and not url.endswith('...') and not url.endswith(u'…'))))
+       if url and not url.endswith('...') and not url.endswith('…')) if _f])
 
     # check for redirect and add their final urls
     redirects = {}  # maps final URL to original URL for redirects
@@ -579,7 +577,7 @@ def original_post_discovery(activity, domains=None, cache=None,
     originals = set()
     mentions = set()
     for url in util.dedupe_urls(candidates):
-      if url in redirects.values():
+      if url in list(redirects.values()):
         # this is a redirected original URL. postpone and handle it when we hit
         # its final URL so that we know the final domain.
         continue
@@ -659,7 +657,7 @@ def get_rsvps_from_event(event):
     author = event.get('author')
 
     rsvps = []
-    for verb, field in RSVP_TO_EVENT.items():
+    for verb, field in list(RSVP_TO_EVENT.items()):
       for actor in event.get(field, []):
         rsvp = {'objectType': 'activity',
                 'verb': verb,
@@ -792,7 +790,7 @@ def post_id(cls, url):
 
     Returns: string, or None
     """
-    return urlparse.urlparse(url).path.rstrip('/').rsplit('/', 1)[-1] or None
+    return urllib.parse.urlparse(url).path.rstrip('/').rsplit('/', 1)[-1] or None
 
   def _content_for_create(self, obj, ignore_formatting=False, prefer_name=False,
                           strip_first_video_tag=False):
@@ -833,4 +831,4 @@ def _content_for_create(self, obj, ignore_formatting=False, prefer_name=False,
     return summary or (
             (name or content) if prefer_name else
             (content or name)
-           ) or u''
+           ) or ''
diff --git a/granary/test/test_atom.py b/granary/test/test_atom.py
index 49bd7f5f..a6b7dd56 100644
--- a/granary/test/test_atom.py
+++ b/granary/test/test_atom.py
@@ -6,9 +6,9 @@
 
 from granary import atom
 
-import test_facebook
-import test_instagram
-import test_twitter
+from . import test_facebook
+from . import test_instagram
+from . import test_twitter
 
 
 class AtomTest(testutil.HandlerTest):
diff --git a/granary/test/test_facebook.py b/granary/test/test_facebook.py
index e12cac33..3b33b274 100644
--- a/granary/test/test_facebook.py
+++ b/granary/test/test_facebook.py
@@ -6,8 +6,8 @@
 
 import copy
 import json
-import urllib
-import urllib2
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
 
 from oauth_dropins.webutil import testutil
 from oauth_dropins.webutil import util
@@ -416,7 +416,7 @@ def tag_uri(name):
   'url': 'https://www.facebook.com/212038/posts/10100176064482163#haha-by-100005',
   'objectType': 'activity',
   'verb': 'react',
-  'content': u'😆',
+  'content': '😆',
   'object': {'url': 'https://www.facebook.com/212038/posts/10100176064482163'},
   'author': {
     'objectType': 'person',
@@ -431,7 +431,7 @@ def tag_uri(name):
   'url': 'https://www.facebook.com/212038/posts/10100176064482163#sad-by-100006',
   'objectType': 'activity',
   'verb': 'react',
-  'content': u'😢',
+  'content': '😢',
   'object': {'url': 'https://www.facebook.com/212038/posts/10100176064482163'},
   'author': {
     'objectType': 'person',
@@ -552,7 +552,7 @@ def tag_uri(name):
   'objectType': 'note',
   'url': 'https://www.facebook.com/212038/posts/222',
   'content': 'Stopped in to grab coffee and saw this table topper. Wow. Just...wow.',
-  'image': {'url': u'https://fbcdn-photos-b-a.akamaihd.net/pic_s.jpg'},
+  'image': {'url': 'https://fbcdn-photos-b-a.akamaihd.net/pic_s.jpg'},
   'published': '2014-04-09T20:44:26+00:00',
   'author': POST_OBJ['author'],
   'to': [{'alias': '@public', 'objectType': 'group'}],
@@ -604,7 +604,7 @@ def tag_uri(name):
     'url': 'https://www.facebook.com/212038/posts/222#wow-by-777',
     'objectType': 'activity',
     'verb': 'react',
-    'content': u'😮',
+    'content': '😮',
     'object': {'url': 'https://www.facebook.com/212038/posts/222'},
     'author': {
       'objectType': 'person',
@@ -863,7 +863,7 @@ def tag_uri(name):
   'count': 2,
   'cover_photo': '1520050698319836',
   'from': {
-    'name': u'Snoøpy Barrett',
+    'name': 'Snoøpy Barrett',
     'id': '1407574399567467'
   },
   'link': 'https://www.facebook.com/album.php?fbid=1520022318322674&id=1407574399567467&aid=1073741827',
@@ -882,7 +882,7 @@ def tag_uri(name):
     'objectType': 'person',
     'id': tag_uri('1407574399567467'),
     'numeric_id': '1407574399567467',
-    'displayName': u'Snoøpy Barrett',
+    'displayName': 'Snoøpy Barrett',
     'image': {'url': 'https://graph.facebook.com/v2.6/1407574399567467/picture?type=large'},
     'url': 'https://www.facebook.com/1407574399567467',
     },
@@ -1014,7 +1014,7 @@ def expect_batch_req(self, url, response, status=200, headers={},
     batch.append({
       'method': 'GET',
       'relative_url': url,
-      'headers': [{'name': n, 'value': v} for n, v in headers.items()],
+      'headers': [{'name': n, 'value': v} for n, v in list(headers.items())],
     })
     batch_responses.append(util.trim_nulls({
       'code': status,
@@ -1160,7 +1160,7 @@ def test_get_activities_self_merge_photos(self):
       {'fb_id': '5'},
       {'fb_id': '66', 'to': [{'objectType':'group', 'alias':'@public'}]},
       {'fb_id': '77', 'to': [{'objectType': 'unknown'}]},
-    ], [{k: v for k, v in activity['object'].items() if k in ('fb_id', 'to')}
+    ], [{k: v for k, v in list(activity['object'].items()) if k in ('fb_id', 'to')}
         for activity in self.fb.get_activities(group_id=source.SELF)])
 
   def test_get_activities_self_photos_returns_list(self):
@@ -1247,13 +1247,13 @@ def test_get_activities_activity_id_with_underscore(self):
     self.expect_urlopen(API_OBJECT % ('12', '34'), {'id': '123'})
     self.mox.ReplayAll()
     obj = self.fb.get_activities(activity_id='12_34')[0]['object']
-    self.assertEquals('123', obj['fb_id'])
+    self.assertEqual('123', obj['fb_id'])
 
   def test_get_activities_activity_id_with_user_id(self):
     self.expect_urlopen(API_OBJECT % ('12', '34'), {'id': '123'})
     self.mox.ReplayAll()
     obj = self.fb.get_activities(activity_id='34', user_id='12')[0]['object']
-    self.assertEquals('123', obj['fb_id'])
+    self.assertEqual('123', obj['fb_id'])
 
   def test_get_activities_activity_id_no_underscore_or_user_id(self):
     with self.assertRaises(NotImplementedError):
@@ -1511,7 +1511,7 @@ def test_get_comment_400s_id_without_underscore(self):
       '123?fields=id,message,from,created_time,message_tags,parent,attachment',
       {}, status=400)
     self.mox.ReplayAll()
-    self.assertRaises(urllib2.HTTPError, self.fb.get_comment, '123')
+    self.assertRaises(urllib.error.HTTPError, self.fb.get_comment, '123')
 
   def test_get_comment_with_activity(self):
     # still makes the API call, since the comment might be paged out or nested
@@ -1552,7 +1552,7 @@ def test_get_share_obj_400s(self):
   def test_get_share_500s(self):
     self.expect_urlopen(API_SHARES % '1_2', {}, status=500)
     self.mox.ReplayAll()
-    self.assertRaises(urllib2.HTTPError, self.fb.get_share, '1', '2', '_')
+    self.assertRaises(urllib.error.HTTPError, self.fb.get_share, '1', '2', '_')
 
   def test_get_share_with_activity(self):
     self.expect_urlopen(API_SHARES % '1_2', {'1_2': {'data': [{'id': SHARE['id']}]}})
@@ -1714,7 +1714,7 @@ def test_post_to_object_with_comment_unknown_id_format(self):
 
   def test_post_to_object_message_tags_list(self):
     post = copy.copy(POST)
-    tags = post['message_tags'].values()
+    tags = list(post['message_tags'].values())
     post['message_tags'] = tags[0] + tags[1]  # both lists
     self.assert_equals(POST_OBJ, self.fb.post_to_object(post))
 
@@ -1863,8 +1863,8 @@ def test_user_to_actor_multiple_urls(self):
 http://b http://c""",
       'link': 'http://x',  # website overrides link
       })
-    self.assertEquals('http://a', actor['url'])
-    self.assertEquals(
+    self.assertEqual('http://a', actor['url'])
+    self.assertEqual(
       [{'value': 'http://a'}, {'value': 'http://b'}, {'value': 'http://c'}],
       actor['urls'])
 
@@ -1872,8 +1872,8 @@ def test_user_to_actor_multiple_urls(self):
       'id': '123',
       'link': 'http://b http://c	http://a',
       })
-    self.assertEquals('http://b', actor['url'])
-    self.assertEquals(
+    self.assertEqual('http://b', actor['url'])
+    self.assertEqual(
       [{'value': 'http://b'}, {'value': 'http://c'}, {'value': 'http://a'}],
       actor['urls'])
 
@@ -2119,7 +2119,7 @@ def test_album_to_object_full(self):
     self.assert_equals(ALBUM_OBJ, self.fb.album_to_object(ALBUM))
 
   def test_create_post(self):
-    self.expect_urlopen(API_PUBLISH_POST, {'id': '123_456'}, data=urllib.urlencode({
+    self.expect_urlopen(API_PUBLISH_POST, {'id': '123_456'}, data=urllib.parse.urlencode({
         'message': 'my msg',
         'tags': '234,345,456',
       }))
@@ -2138,11 +2138,11 @@ def test_create_post(self):
     }, self.fb.create(obj).content)
 
     preview = self.fb.preview_create(obj)
-    self.assertEquals('<span class="verb">post</span>:', preview.description)
-    self.assertEquals('my msg<br /><br /><em>with <a href="https://www.facebook.com/234">Friend 1</a>, <a href="https://www.facebook.com/345">Friend 2</a>, <a href="https://www.facebook.com/456">Friend 3</a></em>', preview.content)
+    self.assertEqual('<span class="verb">post</span>:', preview.description)
+    self.assertEqual('my msg<br /><br /><em>with <a href="https://www.facebook.com/234">Friend 1</a>, <a href="https://www.facebook.com/345">Friend 2</a>, <a href="https://www.facebook.com/456">Friend 3</a></em>', preview.content)
 
   def test_create_post_include_link(self):
-    self.expect_urlopen(API_PUBLISH_POST, {}, data=urllib.urlencode({
+    self.expect_urlopen(API_PUBLISH_POST, {}, data=urllib.parse.urlencode({
       'message': 'my content\n\n(Originally published at: http://obj.co)',
     }))
     self.mox.ReplayAll()
@@ -2159,12 +2159,12 @@ def test_create_post_include_link(self):
         })
     self.fb.create(obj, include_link=source.INCLUDE_LINK)
     preview = self.fb.preview_create(obj, include_link=source.INCLUDE_LINK)
-    self.assertEquals(
+    self.assertEqual(
       'my content\n\n(Originally published at: <a href="http://obj.co">http://obj.co</a>)',
       preview.content)
 
   def test_create_post_with_title(self):
-    self.expect_urlopen(API_PUBLISH_POST, {}, data=urllib.urlencode({
+    self.expect_urlopen(API_PUBLISH_POST, {}, data=urllib.parse.urlencode({
       'message': 'my title\n\nmy content\n\n(Originally published at: http://obj.co)',
     }))
     self.mox.ReplayAll()
@@ -2181,12 +2181,12 @@ def test_create_post_with_title(self):
         })
     self.fb.create(obj, include_link=source.INCLUDE_LINK)
     preview = self.fb.preview_create(obj, include_link=source.INCLUDE_LINK)
-    self.assertEquals(
+    self.assertEqual(
       'my title\n\nmy content\n\n(Originally published at: <a href="http://obj.co">http://obj.co</a>)',
       preview.content)
 
   def test_create_post_with_no_title(self):
-    self.expect_urlopen(API_PUBLISH_POST, {}, data=urllib.urlencode({
+    self.expect_urlopen(API_PUBLISH_POST, {}, data=urllib.parse.urlencode({
       'message': 'my\ncontent\n\n(Originally published at: http://obj.co)',
     }))
     self.mox.ReplayAll()
@@ -2203,7 +2203,7 @@ def test_create_post_with_no_title(self):
         })
     self.fb.create(obj, include_link=source.INCLUDE_LINK)
     preview = self.fb.preview_create(obj, include_link=source.INCLUDE_LINK)
-    self.assertEquals(
+    self.assertEqual(
       'my\ncontent\n\n(Originally published at: <a href="http://obj.co">http://obj.co</a>)',
       preview.content)
 
@@ -2222,7 +2222,7 @@ def test_create_comment(self):
     }, self.fb.create(obj).content)
 
     preview = self.fb.preview_create(obj)
-    self.assertEquals('my cmt', preview.content)
+    self.assertEqual('my cmt', preview.content)
     self.assertIn('<span class="verb">comment</span> on <a href="https://www.facebook.com/547822715231468">this post</a>:', preview.description)
     self.assertIn('<div class="fb-post" data-href="https://www.facebook.com/547822715231468">', preview.description)
 
@@ -2252,7 +2252,7 @@ def test_create_comment_on_post_urls(self):
     self.mox.ReplayAll()
 
     obj = copy.deepcopy(COMMENT_OBJS[0])
-    for post_url, cmt_url in urls.items():
+    for post_url, cmt_url in list(urls.items()):
       obj.update({
           'inReplyTo': [{'url': post_url}],
           'content': 'my cmt',
@@ -2266,7 +2266,7 @@ def test_create_comment_on_post_urls(self):
   def test_create_comment_with_photo(self):
     self.expect_urlopen(
       '547822715231468/comments', {'id': '456_789'},
-      data=urllib.urlencode({'message': 'cc Sam G, Michael M',
+      data=urllib.parse.urlencode({'message': 'cc Sam G, Michael M',
                              'attachment_url': 'http://pict/ure'}))
     self.mox.ReplayAll()
 
@@ -2282,7 +2282,7 @@ def test_create_comment_with_photo(self):
     }, self.fb.create(obj).content)
 
     preview = self.fb.preview_create(obj)
-    self.assertEquals('cc Sam G, Michael M<br /><br /><img src="http://pict/ure" />',
+    self.assertEqual('cc Sam G, Michael M<br /><br /><img src="http://pict/ure" />',
                       preview.content)
     self.assertIn('<span class="verb">comment</span> on <a href="https://www.facebook.com/547822715231468">this post</a>:', preview.description)
     self.assertIn('<div class="fb-post" data-href="https://www.facebook.com/547822715231468">', preview.description)
@@ -2379,7 +2379,7 @@ def test_create_rsvp(self):
                          '%s\n%s' % (created.content, rsvp))
 
     preview = self.fb.preview_create(rsvp)
-    self.assertEquals('<span class="verb">RSVP interested</span> to '
+    self.assertEqual('<span class="verb">RSVP interested</span> to '
                       '<a href="https://www.facebook.com/234/">this event</a>.',
                       preview.description)
 
@@ -2427,8 +2427,8 @@ def test_create_with_photo(self):
 
     # test preview
     preview = self.fb.preview_create(obj)
-    self.assertEquals('<span class="verb">post</span>:', preview.description)
-    self.assertEquals('my caption<br /><br /><img src="http://my/picture" />',
+    self.assertEqual('<span class="verb">post</span>:', preview.description)
+    self.assertEqual('my caption<br /><br /><img src="http://my/picture" />',
                       preview.content)
 
     # test create
@@ -2452,7 +2452,7 @@ def test_create_with_photo_uses_timeline_photos_album(self):
       {'id': '1', 'name': 'foo bar'},
       {'id': '2', 'type': 'wall'},
     ]})
-    self.expect_urlopen('2/photos', {}, data=urllib.urlencode({
+    self.expect_urlopen('2/photos', {}, data=urllib.parse.urlencode({
       'url': 'http://my/picture', 'message': ''}))
     self.mox.ReplayAll()
     self.assert_equals({'type': 'post', 'url': None}, self.fb.create(obj).content)
@@ -2473,7 +2473,7 @@ def test_create_with_photo_and_person_tags(self):
 
     # test preview
     preview = self.fb.preview_create(obj)
-    self.assertEquals(
+    self.assertEqual(
       '<br /><br /><img src="http://my/picture" /><br /><br /><em>with '
       '<a href="https://www.facebook.com/234">Foo</a>, '
       '<a href="https://www.facebook.com/345">User 345</a></em>',
@@ -2482,7 +2482,7 @@ def test_create_with_photo_and_person_tags(self):
     # test create
     self.expect_urlopen(API_ALBUMS % 'me', {'data': []})
     self.expect_urlopen(
-      API_PUBLISH_PHOTO, {'id': '123_456'}, data=urllib.urlencode({
+      API_PUBLISH_PHOTO, {'id': '123_456'}, data=urllib.parse.urlencode({
         'url': 'http://my/picture',
         'message': '',
         'tags': json.dumps([{'tag_uid': '234'}, {'tag_uid': '345'}]),
@@ -2504,13 +2504,13 @@ def test_create_with_video(self):
 
     # test preview
     preview = self.fb.preview_create(obj)
-    self.assertEquals('<span class="verb">post</span>:', preview.description)
-    self.assertEquals('my\ncaption<br /><br /><video controls src="http://my/video">'
+    self.assertEqual('<span class="verb">post</span>:', preview.description)
+    self.assertEqual('my\ncaption<br /><br /><video controls src="http://my/video">'
                       '<a href="http://my/video">this video</a></video>',
                       preview.content)
 
     # test create
-    self.expect_urlopen(API_UPLOAD_VIDEO, {}, data=urllib.urlencode({
+    self.expect_urlopen(API_UPLOAD_VIDEO, {}, data=urllib.parse.urlencode({
       'file_url': 'http://my/video', 'description': 'my\ncaption'}))
     self.mox.ReplayAll()
     self.assert_equals({'type': 'post', 'url': None}, self.fb.create(obj).content)
@@ -2524,7 +2524,7 @@ def test_create_notification(self):
       'access_token': 'my_app_id|my_app_secret',
       }
     self.expect_urlopen('my-username/notifications', '',
-                        data=urllib.urlencode(params))
+                        data=urllib.parse.urlencode(params))
     self.mox.ReplayAll()
     self.fb.create_notification('my-username', 'my text', 'my link')
 
@@ -2539,7 +2539,7 @@ def test_base_object_resolve_numeric_id(self):
   def test_parse_id(self):
     def check(expected, id, is_comment):
       got = facebook.Facebook.parse_id(id, is_comment=is_comment)
-      self.assertEquals(facebook.FacebookId(*expected), got,
+      self.assertEqual(facebook.FacebookId(*expected), got,
                         '%s %s, got %s' % (id, is_comment, got))
 
     blank = facebook.FacebookId(None, None, None)
@@ -2613,7 +2613,7 @@ def test_urlopen_batch_error(self):
     try:
       self.fb.urlopen_batch(('abc', 'def'))
       assert False, 'expected HTTPError'
-    except urllib2.HTTPError, e:
+    except urllib.error.HTTPError as e:
       self.assertEqual(499, e.code)
       self.assertEqual('error body', e.reason)
 
diff --git a/granary/test/test_flickr.py b/granary/test/test_flickr.py
index efbc1569..d5959e3b 100644
--- a/granary/test/test_flickr.py
+++ b/granary/test/test_flickr.py
@@ -1,14 +1,14 @@
 """Unit tests for flickr.py
 """
-from __future__ import unicode_literals, print_function
+
 
 import copy
 import json
 import mox
 import requests
 import socket
-import urllib
-import urllib2
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
 
 from oauth_dropins import appengine_config
 from oauth_dropins.webutil import testutil
@@ -677,7 +677,7 @@ def expect_call_api_method(self, method, params, result):
     }
     full_params.update(params)
     return self.expect_urlopen('https://api.flickr.com/services/rest?'
-                               + urllib.urlencode(full_params), result)
+                               + urllib.parse.urlencode(full_params), result)
 
   def test_get_actor(self):
     self.expect_call_api_method('flickr.people.getInfo', {
@@ -841,7 +841,7 @@ def test_preview_create_photo(self):
     self.mox.ReplayAll()
     preview = self.flickr.preview_create(
       OBJECT, include_link=source.INCLUDE_LINK)
-    self.assertEquals('post', preview.description)
+    self.assertEqual('post', preview.description)
     self.assertIn('Photo #164', preview.content)
     self.assertIn(
       'First Homebrew Website Club in Gothenburg #IndieWeb',
@@ -917,7 +917,7 @@ def test_create_photo_success(self):
       }, '{"stat": "ok"}')
 
     self.mox.ReplayAll()
-    self.assertEquals({
+    self.assertEqual({
       'id': '9876',
       'url': 'https://www.flickr.com/photos/kindofblue115/9876/',
       'type': 'post',
@@ -950,7 +950,7 @@ def test_create_photo_failure(self):
 """)
     self.mox.ReplayAll()
 
-    self.assertRaises(urllib2.HTTPError, self.flickr.create, OBJECT)
+    self.assertRaises(urllib.error.HTTPError, self.flickr.create, OBJECT)
 
   def test_create_video_success(self):
     self.flickr._user_id = '39216764@N00'
@@ -967,8 +967,8 @@ def test_create_video_success(self):
 
     # preview
     preview = self.flickr.preview_create(obj)
-    self.assertEquals('post', preview.description)
-    self.assertEquals(
+    self.assertEqual('post', preview.description)
+    self.assertEqual(
       '<div>check\nout</div>'
         '<video controls src="https://jeena.net/videos/xyz.mp4">'
         '<a href="https://jeena.net/videos/xyz.mp4">this video</a></video>',
@@ -1031,11 +1031,11 @@ def test_create_video_too_big(self):
   def test_preview_create_comment(self):
     preview = self.flickr.preview_create(
       REPLY_OBJ, include_link=source.INCLUDE_LINK)
-    self.assertEquals(
+    self.assertEqual(
       'comment on <a href="https://www.flickr.com/photos/marietta_wood_works/'
       '21904325000/in/contacts/">this photo</a>.',
       preview.description)
-    self.assertEquals(
+    self.assertEqual(
       'punkins!\n\n'
       '(Originally published at: https://kylewm.com/2015/11/punkins)',
       preview.content)
@@ -1064,10 +1064,10 @@ def test_create_comment(self):
 
     reply_content = self.flickr.create(
       REPLY_OBJ, include_link=source.INCLUDE_LINK).content
-    self.assertEquals(
+    self.assertEqual(
       '4942564-21904325000-72157661220102352',
       reply_content.get('id'))
-    self.assertEquals(
+    self.assertEqual(
       'https://www.flickr.com/photos/marietta_wood_works/21904325000/'
       '#comment72157661220102352',
       reply_content.get('url'))
@@ -1084,7 +1084,7 @@ def test_create_favorite(self):
       json.dumps({'person': {'nsid': '39216764@N00'}}))
 
     self.mox.ReplayAll()
-    self.assertEquals({
+    self.assertEqual({
       'type': 'like',
       'url': 'https://www.flickr.com/photos/marietta_wood_works/21904325000/in/contacts/#favorited-by-39216764@N00',
     }, self.flickr.create(LIKE_OBJ).content)
diff --git a/granary/test/test_googleplus.py b/granary/test/test_googleplus.py
index e12902c6..75f92130 100644
--- a/granary/test/test_googleplus.py
+++ b/granary/test/test_googleplus.py
@@ -162,7 +162,7 @@ def tag_uri(name):
    [None],
    "https://lh4.googleusercontent.com/-OvNQMFbbks0/AAAAAAAAAAI/AAAAAAAAOuo/YXnsx5bfWxo/photo.jpg",
    None,
-   u"Hi! It’s been a while since I’ve written because we’ve been hard at work, but I’m very happy to take the wraps off our latest feature (or really, series of features): Realtime Expense Reports. I know I’ve been hyping this up for a long time, and you’re…",
+   "Hi! It’s been a while since I’ve written because we’ve been hard at work, but I’m very happy to take the wraps off our latest feature (or really, series of features): Realtime Expense Reports. I know I’ve been hyping this up for a long time, and you’re…",
    "+DavidBarrettQuinthar/posts/VefFHLMoCqV",
    0,
    0,
@@ -268,7 +268,7 @@ def tag_uri(name):
       'objectType': 'note',
       'published': '2015-08-24T14:11:53Z',
       'updated': '2015-08-24T14:11:53Z',
-      'content': u'Hi! It’s been a while since I’ve written because we’ve been hard at work, but I’m very happy to take the wraps off our latest feature (or really, series of features): Realtime Expense Reports. I know I’ve been hyping this up for a long time, and you’re…',
+      'content': 'Hi! It’s been a while since I’ve written because we’ve been hard at work, but I’m very happy to take the wraps off our latest feature (or really, series of features): Realtime Expense Reports. I know I’ve been hyping this up for a long time, and you’re…',
       'attachments': [
         {
           'objectType': 'article',
@@ -406,7 +406,7 @@ def test_get_activities_fetch_extras(self):
         fetch_replies=True, fetch_likes=True, fetch_shares=True, cache=cache))
     for id in '001', '002':
       for prefix in 'AGL ', 'AGS ':
-        self.assertEquals(1, cache[prefix + id])
+        self.assertEqual(1, cache[prefix + id])
 
     # no new extras, so another request won't fill them in
     as_1 = copy.deepcopy(ACTIVITY_AS)
@@ -442,7 +442,7 @@ def test_get_activities_response_etag(self):
           }))
     resp = self.googleplus.get_activities_response(
       fetch_replies=True, fetch_likes=True, fetch_shares=True)
-    self.assertEquals('"my etag"', resp['etag'])
+    self.assertEqual('"my etag"', resp['etag'])
 
   def test_get_activities_304_not_modified(self):
     """Requests with matching ETags return 304 Not Modified."""
@@ -463,7 +463,7 @@ def test_postprocess_actor_url_field(self):
                      pa({'urls': [{'value': 'x'}, {'value': 'y'}]}))
 
     # check alias
-    self.assertEquals(self.googleplus.postprocess_actor,
+    self.assertEqual(self.googleplus.postprocess_actor,
                       self.googleplus.user_to_actor)
 
   def test_get_actor_minimal(self):
@@ -523,7 +523,7 @@ def test_html_to_activities(self):
 
   def test_html_to_activities_plusoned(self):
     html_gp = copy.deepcopy(HTML_ACTIVITY_GP)
-    html_gp[1][6].values()[0][69] = [
+    list(html_gp[1][6].values())[0][69] = [
       202,
       [['Billy Bob',
         '1056789',
@@ -555,7 +555,7 @@ def test_html_to_activities_plusoned(self):
   def test_html_to_activities_similar_to_plusoned(self):
     html_gp = copy.deepcopy(HTML_ACTIVITY_GP)
     for data_at_69 in None, [], [None], [None, None], [None, [None]]:
-      html_gp[1][6].values()[0][69] = data_at_69
+      list(html_gp[1][6].values())[0][69] = data_at_69
       html = (HTML_ACTIVITIES_GP_HEADER + json.dumps(html_gp) +
               HTML_ACTIVITIES_GP_FOOTER)
       self.assert_equals([HTML_ACTIVITY_AS],
diff --git a/granary/test/test_instagram.py b/granary/test/test_instagram.py
index dcb5e15f..0c38f332 100644
--- a/granary/test/test_instagram.py
+++ b/granary/test/test_instagram.py
@@ -8,9 +8,9 @@
 import json
 import logging
 import mox
-import StringIO
-import urllib
-import urllib2
+import io
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
 import httplib2
 
 from oauth_dropins.webutil import testutil
@@ -53,12 +53,12 @@ def tag_uri(name):
 }
 COMMENTS = [{  # Instagram
   'created_time': '1349588757',
-  'text': '\u592a\u53ef\u7231\u4e86\u3002cute\uff0cvery cute',
+  'text': '\\u592a\\u53ef\\u7231\\u4e86\\u3002cute\\uff0cvery cute',
   'from': {
     'username': 'averygood',
     'profile_picture': 'http://picture/commenter',
     'id': '232927278',
-    'full_name': '\u5c0f\u6b63',
+    'full_name': '\\u5c0f\\u6b63',
   },
   'id': '789',
 }]
@@ -158,11 +158,11 @@ def tag_uri(name):
     'objectType': 'person',
     'id': tag_uri('232927278'),
     'username': 'averygood',
-    'displayName': '\u5c0f\u6b63',
+    'displayName': '\\u5c0f\\u6b63',
     'image': {'url': 'http://picture/commenter'},
     'url': 'https://www.instagram.com/averygood/',
   },
-  'content': '\u592a\u53ef\u7231\u4e86\u3002cute\uff0cvery cute',
+  'content': '\\u592a\\u53ef\\u7231\\u4e86\\u3002cute\\uff0cvery cute',
   'id': tag_uri('789'),
   'published': '2012-10-07T05:45:57',
   'url': 'https://www.instagram.com/p/ABC123/#comment-789',
@@ -510,18 +510,18 @@ def tag_uri(name):
     'nodes': [],
     'count': 9,
   },
-  'caption': 'Eye of deer \ud83d\udc41 and #selfie from me',
+  'caption': 'Eye of deer \\ud83d\\udc41 and #selfie from me',
   'comments': {
     'nodes': [{
       'user': {
         'id': '232927278',
         'profile_pic_url': 'http:\/\/picture\/commenter',
         'username': 'averygood',
-        'full_name': '\u5c0f\u6b63',
+        'full_name': '\\u5c0f\\u6b63',
       },
       'id': '789',
       'created_at': 1349588757,
-      'text': '\u592a\u53ef\u7231\u4e86\u3002cute\uff0cvery cute',
+      'text': '\\u592a\\u53ef\\u7231\\u4e86\\u3002cute\\uff0cvery cute',
     }],
     'count': 1,
   },
@@ -723,7 +723,7 @@ def tag_uri(name):
   'object': {
     'objectType': 'video',
     'author': HTML_ACTOR,
-    'content': 'Eye of deer \ud83d\udc41 and #selfie from me',
+    'content': 'Eye of deer \\ud83d\\udc41 and #selfie from me',
     'id': tag_uri('789_456'),
     'published': '2016-01-17T13:15:52',
     'url': 'https://www.instagram.com/p/XYZ789/',
@@ -852,7 +852,7 @@ def test_get_activities_other_400_error(self):
     self.expect_urlopen('https://api.instagram.com/v1/media/000',
                         'BAD REQUEST', status=400)
     self.mox.ReplayAll()
-    self.assertRaises(urllib2.HTTPError, self.instagram.get_activities,
+    self.assertRaises(urllib.error.HTTPError, self.instagram.get_activities,
                       activity_id='000')
 
   def test_get_activities_min_id(self):
@@ -985,8 +985,8 @@ def test_get_activities_scrape_cookie_not_logged_in(self):
       self.instagram.get_activities(group_id=source.FRIENDS, scrape=True,
                                     cookie='my cookie')
 
-    self.assertEquals('401 Unauthorized', cm.exception.message)
-    self.assertEquals(401, cm.exception.response.status_code)
+    self.assertEqual('401 Unauthorized', cm.exception.message)
+    self.assertEqual(401, cm.exception.response.status_code)
 
   def test_get_activities_scrape_activity_id(self):
     self.expect_requests_get(
@@ -1035,8 +1035,8 @@ def test_get_activities_scrape_cookie_redirects_to_login(self):
       self.instagram.get_activities(group_id=source.FRIENDS, scrape=True,
                                     cookie='my cookie')
 
-    self.assertEquals('401 Unauthorized', cm.exception.message)
-    self.assertEquals(401, cm.exception.response.status_code)
+    self.assertEqual('401 Unauthorized', cm.exception.message)
+    self.assertEqual(401, cm.exception.response.status_code)
 
   def test_get_activities_scrape_options_not_implemented(self):
     for group_id in None, source.ALL, source.SEARCH:
@@ -1059,7 +1059,7 @@ def test_get_activities_scrape_not_found(self):
     resp = self.instagram.get_activities_response(
       group_id=source.SELF, user_id='foo', scrape=True)
     self.assertIsNone(resp['actor'])
-    self.assertEquals([], resp['items'])
+    self.assertEqual([], resp['items'])
 
   def test_get_activities_scrape_error(self):
     self.expect_requests_get(instagram.HTML_BASE_URL,
@@ -1072,7 +1072,7 @@ def test_get_activities_scrape_error(self):
       a = self.instagram.get_activities(group_id=source.FRIENDS, scrape=True,
                                         cookie='my cookie')
 
-    self.assertEquals(429, cm.exception.response.status_code)
+    self.assertEqual(429, cm.exception.response.status_code)
 
   def test_get_video(self):
     self.expect_urlopen('https://api.instagram.com/v1/media/5678',
@@ -1145,7 +1145,7 @@ def test_media_to_object(self):
     self.assert_equals(MEDIA_OBJ, obj)
 
     # check that the images are ordered the way we expect, largest to smallest
-    self.assertEquals(MEDIA_OBJ['attachments'][0]['image'],
+    self.assertEqual(MEDIA_OBJ['attachments'][0]['image'],
                       obj['attachments'][0]['image'])
 
   def test_media_to_object_with_likes(self):
@@ -1251,7 +1251,7 @@ def test_create_comment(self):
     self.expect_urlopen(
       'https://api.instagram.com/v1/media/123_456/comments',
       '{"meta":{"status":200}}',
-      data=urllib.urlencode({'access_token': self.instagram.access_token,
+      data=urllib.parse.urlencode({'access_token': self.instagram.access_token,
                              'text': COMMENTS[0]['text']}))
 
     self.mox.ReplayAll()
@@ -1271,7 +1271,7 @@ def test_create_comment_unauthorized(self):
     # create comments with the API, with an unapproved app
     self.expect_urlopen(
       'https://api.instagram.com/v1/media/123_456/comments',
-      data=urllib.urlencode({'access_token': self.instagram.access_token,
+      data=urllib.parse.urlencode({'access_token': self.instagram.access_token,
                              'text': COMMENTS[0]['text']}),
       response='{"meta": {"code": 400, "error_type": u"OAuthPermissionsException", "error_message": "This request requires scope=comments, but this access token is not authorized with this scope. The user must re-authorize your application with scope=comments to be granted write permissions."}}',
       status=400)
@@ -1280,7 +1280,7 @@ def test_create_comment_unauthorized(self):
     to_publish = copy.deepcopy(COMMENT_OBJS[0])
     del to_publish['url']
 
-    self.assertRaises(urllib2.HTTPError, instagram.Instagram(
+    self.assertRaises(urllib.error.HTTPError, instagram.Instagram(
       allow_comment_creation=True).create, to_publish)
 
   def test_create_comments_disabled(self):
@@ -1301,7 +1301,7 @@ def test_create_comments_disabled(self):
     self.assertIn('Cannot', create.error_html)
 
   def test_base_object(self):
-    self.assertEquals({
+    self.assertEqual({
       'id': '123',
       'url': 'https://www.instagram.com/p/zHA5BLo1Mo/',
       }, self.instagram.base_object({
@@ -1310,7 +1310,7 @@ def test_base_object(self):
       }))
 
     # with only URL, we don't know id
-    self.assertEquals(
+    self.assertEqual(
       {'url': 'https://www.instagram.com/p/zHA5BLo1Mo/'},
       self.instagram.base_object({
         'object': {'url': 'https://www.instagram.com/p/zHA5BLo1Mo/'},
@@ -1374,4 +1374,4 @@ def test_id_to_shortcode(self):
         ('BDJ7Nr5Nxpa', 'BDJ7Nr5Nxpa'),
         ('BDJ7N_5Nxpa', 'BDJ7N_5Nxpa'),
     ):
-      self.assertEquals(shortcode, self.instagram.id_to_shortcode(id))
+      self.assertEqual(shortcode, self.instagram.id_to_shortcode(id))
diff --git a/granary/test/test_microformats2.py b/granary/test/test_microformats2.py
index c8f139ab..eace7ffa 100644
--- a/granary/test/test_microformats2.py
+++ b/granary/test/test_microformats2.py
@@ -22,8 +22,8 @@ def test_post_type_discovery(self):
       obj = microformats2.json_to_object(
         {'type': ['h-entry'],
           'properties': {prop: ['http://foo/bar']}})
-      self.assertEquals('activity', obj['objectType'])
-      self.assertEquals(verb, obj['verb'])
+      self.assertEqual('activity', obj['objectType'])
+      self.assertEqual(verb, obj['verb'])
 
   def test_verb_require_of_suffix(self):
     for prop in 'like', 'repost':
@@ -35,7 +35,7 @@ def test_verb_require_of_suffix(self):
   def test_ignore_h_as(self):
     """https://github.com/snarfed/bridgy/issues/635"""
     obj = microformats2.json_to_object({'type': ['h-entry']})
-    self.assertEquals('note', obj['objectType'])
+    self.assertEqual('note', obj['objectType'])
 
   def test_html_content_and_summary(self):
     for expected_content, expected_summary, value in (
@@ -46,8 +46,8 @@ def test_html_content_and_summary(self):
         (None, None, {})):
       obj = microformats2.json_to_object({'properties': {'content': [value],
                                                          'summary': [value]}})
-      self.assertEquals(expected_content, obj.get('content'))
-      self.assertEquals(expected_summary, obj.get('summary'))
+      self.assertEqual(expected_content, obj.get('content'))
+      self.assertEqual(expected_summary, obj.get('summary'))
 
   def test_photo_property_is_not_url(self):
     """handle the case where someone (incorrectly) marks up the caption
@@ -56,7 +56,7 @@ def test_photo_property_is_not_url(self):
     mf2 = {'properties':
            {'photo': ['the caption', 'http://example.com/image.jpg']}}
     obj = microformats2.json_to_object(mf2)
-    self.assertEquals([{'url': 'http://example.com/image.jpg'}], obj['image'])
+    self.assertEqual([{'url': 'http://example.com/image.jpg'}], obj['image'])
 
   def test_photo_property_has_no_url(self):
     """handle the case where the photo property is *only* text, not a url"""
@@ -72,7 +72,7 @@ def test_video_stream(self):
     mf2 = {'properties':
            {'video': ['http://example.com/video.mp4']}}
     obj = microformats2.json_to_object(mf2)
-    self.assertEquals([{'url': 'http://example.com/video.mp4'}], obj['stream'])
+    self.assertEqual([{'url': 'http://example.com/video.mp4'}], obj['stream'])
 
   def test_nested_compound_url_object(self):
     mf2 = {'properties': {
@@ -87,10 +87,10 @@ def test_nested_compound_url_object(self):
              }],
            }}
     obj = microformats2.json_to_object(mf2)
-    self.assertEquals('http://nested', obj['object']['url'])
+    self.assertEqual('http://nested', obj['object']['url'])
 
   def test_object_to_json_unescapes_html_entities(self):
-    self.assertEquals({
+    self.assertEqual({
       'type': ['h-entry'],
       'properties': {'content': [{
         'html': 'Entity &lt; <a href="http://my/link">link too</a>',
@@ -105,7 +105,7 @@ def test_object_to_json_unescapes_html_entities(self):
      }))
 
   def test_object_to_json_note_with_in_reply_to(self):
-    self.assertEquals({
+    self.assertEqual({
       'type': ['h-entry'],
       'properties': {
         'content': [{
@@ -126,7 +126,7 @@ def test_object_to_json_note_with_in_reply_to(self):
       }}))
 
   def test_object_to_json_preserves_url_order(self):
-    self.assertEquals({
+    self.assertEqual({
       'type': ['h-card'],
       'properties': {
         'url': ['http://2', 'http://4', 'http://6'],
@@ -159,7 +159,7 @@ def test_object_to_html_note_with_in_reply_to(self):
         'content': '@hey great post',
       }
     })
-    self.assertEquals(re.sub('\n\s*', '\n', expected),
+    self.assertEqual(re.sub('\n\s*', '\n', expected),
                       re.sub('\n\s*', '\n', result))
 
   def test_render_content_link_with_image(self):
@@ -384,13 +384,13 @@ def test_object_to_json_reaction(self):
     self.assert_equals({
       'type': ['h-entry'],
       'properties': {
-        'content': [{'html': u'✁', 'value': u'✁'}],
+        'content': [{'html': '✁', 'value': '✁'}],
         'in-reply-to': ['https://orig/post'],
       },
     }, microformats2.object_to_json({
       'objectType': 'activity',
       'verb': 'react',
-      'content': u'✁',
+      'content': '✁',
       'object': {'url': 'https://orig/post'},
     }))
 
@@ -398,13 +398,13 @@ def test_object_to_json_multiple_object_urls(self):
     self.assert_equals({
       'type': ['h-entry'],
       'properties': {
-        'content': [{'html': u'✁', 'value': u'✁'}],
+        'content': [{'html': '✁', 'value': '✁'}],
         'in-reply-to': ['https://orig/post/1', 'https://orig/post/2'],
       },
     }, microformats2.object_to_json({
       'objectType': 'activity',
       'verb': 'react',
-      'content': u'✁',
+      'content': '✁',
       'object': [
         {'url': 'https://orig/post/1'},
         {'url': 'https://orig/post/2'},
@@ -424,10 +424,10 @@ def test_get_string_urls(self):
         (['nested'], [{'type': ['h-ok'], 'properties': {'url': [
             {'type': ['h-nested'], 'url': ['nested']}]}}]),
         ):
-      self.assertEquals(expected, microformats2.get_string_urls(objs))
+      self.assertEqual(expected, microformats2.get_string_urls(objs))
 
   def test_img_blank_alt(self):
-    self.assertEquals('<img class="bar" src="foo" alt="" />',
+    self.assertEqual('<img class="bar" src="foo" alt="" />',
                       microformats2.img('foo', 'bar', None))
 
   def test_json_to_html_no_properties_or_type(self):
@@ -447,7 +447,7 @@ def test_json_to_object_with_location(self):
         }],
       },
     })
-    self.assertEquals({
+    self.assertEqual({
       'latitude': 50.820641,
       'longitude': -0.149522,
       'objectType': 'place',
@@ -470,7 +470,7 @@ def test_json_to_object_with_categories(self):
       },
     })
 
-    self.assertEquals([
+    self.assertEqual([
       {
         'objectType': 'person',
         'displayName': 'Kyle Mahan',
@@ -533,8 +533,8 @@ def test_object_urls(self):
           ],
         }),
     ):
-      self.assertEquals(expected, microformats2.object_urls(actor))
+      self.assertEqual(expected, microformats2.object_urls(actor))
 
   def test_hcard_to_html_no_properties(self):
-    self.assertEquals('', microformats2.hcard_to_html({}))
-    self.assertEquals('', microformats2.hcard_to_html({'properties': {}}))
+    self.assertEqual('', microformats2.hcard_to_html({}))
+    self.assertEqual('', microformats2.hcard_to_html({'properties': {}}))
diff --git a/granary/test/test_source.py b/granary/test/test_source.py
index 40f5820a..d4906443 100644
--- a/granary/test/test_source.py
+++ b/granary/test/test_source.py
@@ -15,8 +15,8 @@
 from granary import source
 from granary.source import Source
 from granary import twitter
-import test_facebook
-import test_googleplus
+from . import test_facebook
+from . import test_googleplus
 
 
 LIKES = [{
@@ -31,7 +31,7 @@
 REACTIONS = [{
   'id': 'tag:fake.com:apple',
   'verb': 'react',
-  'content': u'✁',
+  'content': '✁',
   'author': {'id': 'tag:fake.com:5'},
   'object': {'url': 'http://foo/like/5'},
 }]
@@ -171,7 +171,7 @@ def test_original_post_discovery(self):
           ['https://foo.com/1'])
 
     # exclude ellipsized URLs
-    for ellipsis in '...', u'…':
+    for ellipsis in '...', '…':
       url = 'foo.com/1' + ellipsis
       check({'content': 'x (%s)' % url,
              'attachments': [{'objectType': 'article', 'url': 'http://' + url}]},
@@ -179,7 +179,7 @@ def test_original_post_discovery(self):
 
     # exclude ellipsized PSCs and PSLs
     for separator in '/', ' ':
-      for ellipsis in '...', u'…':
+      for ellipsis in '...', '…':
         check({'content': 'x (ttk.me%s123%s)' % (separator, ellipsis)}, [])
 
     # domains param
@@ -431,21 +431,21 @@ def test_activity_changed(self):
                                                    '%s\n%s' % (before, after))
 
   def test_sources_global(self):
-    self.assertEquals(facebook.Facebook, source.sources['facebook'])
-    self.assertEquals(googleplus.GooglePlus, source.sources['google+'])
-    self.assertEquals(instagram.Instagram, source.sources['instagram'])
-    self.assertEquals(twitter.Twitter, source.sources['twitter'])
+    self.assertEqual(facebook.Facebook, source.sources['facebook'])
+    self.assertEqual(googleplus.GooglePlus, source.sources['google+'])
+    self.assertEqual(instagram.Instagram, source.sources['instagram'])
+    self.assertEqual(twitter.Twitter, source.sources['twitter'])
 
   def test_post_id(self):
-    self.assertEquals('1', self.source.post_id('http://x/y/1'))
-    self.assertEquals('1', self.source.post_id('http://x/y/1/'))
+    self.assertEqual('1', self.source.post_id('http://x/y/1'))
+    self.assertEqual('1', self.source.post_id('http://x/y/1/'))
     self.assertIsNone(self.source.post_id('http://x/'))
     self.assertIsNone(self.source.post_id(''))
 
   def test_strip_html_tags(self):
-    self.assertEquals('', source.strip_html_tags(''))
-    self.assertEquals('foo', source.strip_html_tags('foo'))
-    self.assertEquals('xyz', source.strip_html_tags(
+    self.assertEqual('', source.strip_html_tags(''))
+    self.assertEqual('foo', source.strip_html_tags('foo'))
+    self.assertEqual('xyz', source.strip_html_tags(
       '<p>x<a href="l">y</a><br />z</p>'))
 
   def test_is_public(self):
@@ -455,8 +455,8 @@ def test_is_public(self):
                 {'to': [{'alias': 'xyz'},
                         {'objectType': 'unknown'}]},
                ):
-      self.assertIsNone(Source.is_public(obj), `obj`)
-      self.assertIsNone(Source.is_public({'object': obj}), `obj`)
+      self.assertIsNone(Source.is_public(obj), repr(obj))
+      self.assertIsNone(Source.is_public({'object': obj}), repr(obj))
 
     for obj in ({},
                 {'privacy': 'xyz'},
@@ -469,8 +469,8 @@ def test_is_public(self):
                 {'to': [{'alias': '@public'},
                         {'alias': '@private'}]},
                ):
-      self.assertTrue(Source.is_public(obj), `obj`)
-      self.assertTrue(Source.is_public({'object': obj}), `obj`)
+      self.assertTrue(Source.is_public(obj), repr(obj))
+      self.assertTrue(Source.is_public({'object': obj}), repr(obj))
 
     for obj in ({'to': [{'objectType': 'group', 'alias': '@private'}]},
                 {'to': [{'objectType': 'group', 'alias': 'xyz'}]},
@@ -481,5 +481,5 @@ def test_is_public(self):
                         {'alias': 'xyz'},
                         {'alias': '@private'}]},
                ):
-      self.assertFalse(Source.is_public(obj), `obj`)
-      self.assertFalse(Source.is_public({'object': obj}), `obj`)
+      self.assertFalse(Source.is_public(obj), repr(obj))
+      self.assertFalse(Source.is_public({'object': obj}), repr(obj))
diff --git a/granary/test/test_testdata.py b/granary/test/test_testdata.py
index cd5a0767..799d9803 100644
--- a/granary/test/test_testdata.py
+++ b/granary/test/test_testdata.py
@@ -31,7 +31,7 @@ def read_json(filename):
   try:
     with open(filename) as f:
       return json.loads(f.read())
-  except Exception, e:
+  except Exception as e:
     e.args = ('%s: ' % filename,) + e.args
     raise
 
diff --git a/granary/test/test_twitter.py b/granary/test/test_twitter.py
index a5f83129..06adc97b 100644
--- a/granary/test/test_twitter.py
+++ b/granary/test/test_twitter.py
@@ -3,13 +3,13 @@
 """
 
 import copy
-import httplib
+import http.client
 import json
 import mox
 import requests
 import socket
-import urllib
-import urllib2
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
 
 from oauth_dropins import appengine_config
 from oauth_dropins.webutil import testutil
@@ -192,13 +192,13 @@ def tag_uri(name):
       }],
   'attachments': [{
       'objectType': 'image',
-      'image': {'url': u'http://p.twimg.com/picture1'},
+      'image': {'url': 'http://p.twimg.com/picture1'},
       }, {
       'objectType': 'image',
-      'image': {'url': u'http://p.twimg.com/picture2'},
+      'image': {'url': 'http://p.twimg.com/picture2'},
       }, {
       'objectType': 'image',
-      'image': {'url': u'http://p.twimg.com/picture3'},
+      'image': {'url': 'http://p.twimg.com/picture3'},
       }],
   }
 ACTIVITY = {  # ActivityStreams
@@ -580,9 +580,9 @@ def expect_urlopen(self, url, response=None, params=None, **kwargs):
     if not url.startswith('http'):
       url = twitter.API_BASE + url
     if params:
-      url += '?' + urllib.urlencode(params)
+      url += '?' + urllib.parse.urlencode(params)
       kwargs.setdefault('data', '')
-    if not isinstance(response, basestring):
+    if not isinstance(response, str):
       response=json.dumps(response)
     return super(TwitterTest, self).expect_urlopen(
       url, response=response, **kwargs)
@@ -742,7 +742,7 @@ def test_get_activities_quote_tweets(self):
     twitter.QUOTE_SEARCH_BATCH_SIZE = 5  # reduce the batch size for testing
     # search for 8 tweets to make sure we split them up into groups of <= 5
     tweets = []
-    for id in xrange(1000, 1008):
+    for id in range(1000, 1008):
       tweet = copy.deepcopy(TWEET)
       tweet['id'] = id
       tweet['id_str'] = str(id)
@@ -754,19 +754,19 @@ def test_get_activities_quote_tweets(self):
     self.expect_urlopen('account/verify_credentials.json',
                         {'screen_name': 'schnarfed'})
     self.expect_urlopen(twitter.API_SEARCH % {
-      'q': urllib.quote_plus('@schnarfed'),
+      'q': urllib.parse.quote_plus('@schnarfed'),
       'count': 100,
     } + '&since_id=567', {'statuses': []})
 
     # first search returns no results
     self.expect_urlopen(twitter.API_SEARCH % {
-      'q': urllib.quote_plus('1000 OR 1001 OR 1002 OR 1003 OR 1004'),
+      'q': urllib.parse.quote_plus('1000 OR 1001 OR 1002 OR 1003 OR 1004'),
       'count': 100,
     } + '&since_id=567', {'statuses': []})
 
     # second search finds a quote tweet for 1006 and an RT of that
     self.expect_urlopen(twitter.API_SEARCH % {
-      'q': urllib.quote_plus('1005 OR 1006 OR 1007'),
+      'q': urllib.parse.quote_plus('1005 OR 1006 OR 1007'),
       'count': 100,
     } + '&since_id=567', {
       'statuses': [{
@@ -820,7 +820,7 @@ def test_get_activities_fetch_shares_no_retweets(self):
     tweet['retweet_count'] = 1
     self.expect_urlopen(TIMELINE, [tweet])
     self.expect_urlopen('statuses/retweets.json?id=100'
-                       ).AndRaise(urllib2.HTTPError('url', 404, 'msg', {}, None))
+                       ).AndRaise(urllib.error.HTTPError('url', 404, 'msg', {}, None))
     self.mox.ReplayAll()
 
     self.assert_equals([ACTIVITY], self.twitter.get_activities(fetch_shares=True))
@@ -877,7 +877,7 @@ def test_get_activities_favorites_404(self):
     tweet['favorite_count'] = 1
     self.expect_urlopen(TIMELINE, [tweet])
     self.expect_urlopen('https://twitter.com/i/activity/favorited_popup?id=100'
-      ).AndRaise(urllib2.HTTPError('url', 404, 'msg', {}, None))
+      ).AndRaise(urllib.error.HTTPError('url', 404, 'msg', {}, None))
     self.mox.ReplayAll()
 
     cache = util.CacheDict()
@@ -942,19 +942,19 @@ def test_get_activities_min_id(self):
     self.twitter.get_activities_response(min_id=135)
 
   def test_get_activities_retries(self):
-    for exc in (httplib.HTTPException('Deadline exceeded: foo'),
+    for exc in (http.client.HTTPException('Deadline exceeded: foo'),
                 socket.error('asdf'),
-                urllib2.HTTPError('url', 501, 'msg', {}, None)):
+                urllib.error.HTTPError('url', 501, 'msg', {}, None)):
       for i in range(twitter.RETRIES):
         self.expect_urlopen(TIMELINE).AndRaise(exc)
       self.expect_urlopen(TIMELINE, [])
       self.mox.ReplayAll()
-      self.assertEquals([], self.twitter.get_activities_response()['items'])
+      self.assertEqual([], self.twitter.get_activities_response()['items'])
       self.mox.ResetAll()
 
     # other exceptions shouldn't retry
-    for exc in (httplib.HTTPException('not a deadline'),
-                urllib2.HTTPError('url', 403, 'not a 5xx', {}, None)):
+    for exc in (http.client.HTTPException('not a deadline'),
+                urllib.error.HTTPError('url', 403, 'not a 5xx', {}, None)):
       self.expect_urlopen(TIMELINE).AndRaise(exc)
       self.mox.ReplayAll()
       self.assertRaises(exc.__class__, self.twitter.get_activities_response)
@@ -1029,13 +1029,13 @@ def test_tweet_to_object_entity_indices_handle_display_urls(self):
     obj = self.twitter.tweet_to_object(tweet)
     for tag in obj['tags']:
       if tag['displayName'] == 'Dan Shipper':
-        self.assertEquals(102, tag['startIndex'])
-        self.assertEquals(11, tag['length'])
+        self.assertEqual(102, tag['startIndex'])
+        self.assertEqual(11, tag['length'])
         break
     else:
       self.fail('Dan Shipper not found')
 
-    self.assertEquals('@schnarfed Hey Ryan, You might find this semi-related and interesting: <a href="https://www.onename.io/">onename.io</a> Heard about it from <a href="https://twitter.com/danshipper">@danshipper</a> this week.',
+    self.assertEqual('@schnarfed Hey Ryan, You might find this semi-related and interesting: <a href="https://www.onename.io/">onename.io</a> Heard about it from <a href="https://twitter.com/danshipper">@danshipper</a> this week.',
                       microformats2.render_content(obj))
 
   def test_tweet_to_object_retweet_with_entities(self):
@@ -1092,11 +1092,11 @@ def test_tweet_to_object_multiple_pictures_only_one_picture_link(self):
     self.assert_equals({
       'id': tag_uri('726480459488587776'),
       'objectType': 'note',
-      'content': u'\u2611 Harley Davidson Museum\u00ae \u2611 Schlitz .... \u2611 Milwaukee ',
+      'content': '\u2611 Harley Davidson Museum\u00ae \u2611 Schlitz .... \u2611 Milwaukee ',
       'attachments': [{'objectType': 'image'}, {'objectType': 'image'}],
     }, self.twitter.tweet_to_object({
       'id_str': '726480459488587776',
-      'text': u'\u2611 Harley Davidson Museum\u00ae \u2611 Schlitz .... \u2611 Milwaukee https://t.co/6Ta5P8A2cs',
+      'text': '\u2611 Harley Davidson Museum\u00ae \u2611 Schlitz .... \u2611 Milwaukee https://t.co/6Ta5P8A2cs',
       'extended_entities': {
         'media': [{
           'id_str': '1',
@@ -1175,7 +1175,7 @@ def test_retweet_to_object(self):
       self.assert_equals(share, self.twitter.retweet_to_object(retweet))
 
     # not a retweet
-    self.assertEquals(None, self.twitter.retweet_to_object(TWEET))
+    self.assertEqual(None, self.twitter.retweet_to_object(TWEET))
 
   def test_streaming_event_to_object(self):
     self.assert_equals(LIKE_OBJ,
@@ -1188,7 +1188,7 @@ def test_streaming_event_to_object(self):
       'target': USER,
       'target_object': TWEET,
       }
-    self.assertEquals(None, self.twitter.streaming_event_to_object(follow))
+    self.assertEqual(None, self.twitter.streaming_event_to_object(follow))
 
   def test_favorites_html_to_likes(self):
     self.assert_equals([], self.twitter.favorites_html_to_likes(TWEET, ""))
@@ -1250,14 +1250,14 @@ def test_urlopen_not_json(self):
     try:
       self.twitter.urlopen('xyz')
       self.fail('Expected HTTPError')
-    except urllib2.HTTPError, e:
+    except urllib.error.HTTPError as e:
       self.assertEqual(503, e.code)
 
   def test_create_tweet(self):
     twitter.MAX_TWEET_LENGTH = 20
     twitter.TCO_LENGTH = 5
 
-    dots = u'…'
+    dots = '…'
     original = (
       'my status',
       'too long, will be ellipsized',
@@ -1311,8 +1311,8 @@ def test_create_tweet(self):
       self.assert_equals(tweet, self.twitter.create(obj).content)
 
       got = self.twitter.preview_create(obj)
-      self.assertEquals('<span class="verb">tweet</span>:', got.description)
-      self.assertEquals(preview, got.content)
+      self.assertEqual('<span class="verb">tweet</span>:', got.description)
+      self.assertEqual(preview, got.content)
 
   def test_tweet_truncate(self):
     """A bunch of tests to exercise the tweet shortening algorithm
@@ -1321,90 +1321,90 @@ def test_tweet_truncate(self):
     twitter.TCO_LENGTH = 23
 
     orig = (
-      u'Hey #indieweb, the coming storm of webmention Spam may not be '
-      u'far away. Those of us that have input fields to send webmentions '
-      u'manually may already be getting them')
+      'Hey #indieweb, the coming storm of webmention Spam may not be '
+      'far away. Those of us that have input fields to send webmentions '
+      'manually may already be getting them')
     expected = (
-      u'Hey #indieweb, the coming storm of webmention Spam may not '
-      u'be far away. Those of us that have input fields to send… '
-      u'https://ben.thatmustbe.me/note/2015/1/31/1/')
+      'Hey #indieweb, the coming storm of webmention Spam may not '
+      'be far away. Those of us that have input fields to send… '
+      'https://ben.thatmustbe.me/note/2015/1/31/1/')
     result = self.twitter._truncate(
       orig, 'https://ben.thatmustbe.me/note/2015/1/31/1/',
       source.INCLUDE_LINK, 'note', False)
-    self.assertEquals(expected, result)
+    self.assertEqual(expected, result)
 
     orig = expected = (
-      u'Despite names,\n'
-      u'ind.ie&indie.vc are NOT #indieweb @indiewebcamp\n'
-      u'indiewebcamp.com/2014-review#Indie_Term_Re-use\n'
-      u'@iainspad @sashtown @thomatronic (ttk.me t4_81)')
+      'Despite names,\n'
+      'ind.ie&indie.vc are NOT #indieweb @indiewebcamp\n'
+      'indiewebcamp.com/2014-review#Indie_Term_Re-use\n'
+      '@iainspad @sashtown @thomatronic (ttk.me t4_81)')
     result = self.twitter._truncate(
       orig, 'http://tantek.com/1234', source.OMIT_LINK, 'note', False)
-    self.assertEquals(expected, result)
+    self.assertEqual(expected, result)
 
     orig = expected = (
-      u'@davewiner I stubbed a page on the wiki for '
-      u'https://indiewebcamp.com/River4. Edits/improvmnts from users are '
-      u'welcome! @kevinmarks @julien51 @aaronpk')
+      '@davewiner I stubbed a page on the wiki for '
+      'https://indiewebcamp.com/River4. Edits/improvmnts from users are '
+      'welcome! @kevinmarks @julien51 @aaronpk')
     result = self.twitter._truncate(
       orig, 'https://kylewm.com/5678', source.INCLUDE_IF_TRUNCATED,
       'note', False)
-    self.assertEquals(expected, result)
+    self.assertEqual(expected, result)
 
     orig = expected = (
-      u'This is a long tweet with (foo.com/parenthesized-urls) and urls '
-      u'that wikipedia.org/Contain_(Parentheses), a url with a query '
-      u'string;foo.withknown.com/example?query=parameters')
+      'This is a long tweet with (foo.com/parenthesized-urls) and urls '
+      'that wikipedia.org/Contain_(Parentheses), a url with a query '
+      'string;foo.withknown.com/example?query=parameters')
     result = self.twitter._truncate(
       orig, 'https://foo.bar/', source.INCLUDE_IF_TRUNCATED, 'note', False)
-    self.assertEquals(expected, result)
+    self.assertEqual(expected, result)
 
     orig = (
-      u'This is a long tweet with (foo.com/parenthesized-urls) and urls '
-      u'that wikipedia.org/Contain_(Parentheses), that is one charc too '
-      u'long:foo.withknown.com/example?query=parameters')
+      'This is a long tweet with (foo.com/parenthesized-urls) and urls '
+      'that wikipedia.org/Contain_(Parentheses), that is one charc too '
+      'long:foo.withknown.com/example?query=parameters')
     expected = (
-      u'This is a long tweet with (foo.com/parenthesized-urls) and urls '
-      u'that wikipedia.org/Contain_(Parentheses), that is one charc too '
-      u'long:…')
+      'This is a long tweet with (foo.com/parenthesized-urls) and urls '
+      'that wikipedia.org/Contain_(Parentheses), that is one charc too '
+      'long:…')
     result = self.twitter._truncate(
       orig, 'http://foo.com/', source.OMIT_LINK, 'note', False)
-    self.assertEquals(expected, result)
+    self.assertEqual(expected, result)
 
     # test case-insensitive link matching
     orig = (
-      u'The Telegram Bot API is the best bot API ever. Everyone should '
-      u'learn from it, especially Matrix.org, which currently requires a '
-      u'particular URL structure and registration files.')
+      'The Telegram Bot API is the best bot API ever. Everyone should '
+      'learn from it, especially Matrix.org, which currently requires a '
+      'particular URL structure and registration files.')
     expected = (
-      u'The Telegram Bot API is the best bot API ever. Everyone should learn '
-      u'from it, especially Matrix.org… '
-      u'https://unrelenting.technology/notes/2015-09-05-00-35-13')
+      'The Telegram Bot API is the best bot API ever. Everyone should learn '
+      'from it, especially Matrix.org… '
+      'https://unrelenting.technology/notes/2015-09-05-00-35-13')
     result = self.twitter._truncate(
       orig, 'https://unrelenting.technology/notes/2015-09-05-00-35-13',
       source.INCLUDE_IF_TRUNCATED,
       'note', False)
-    self.assertEquals(expected, result)
+    self.assertEqual(expected, result)
 
     twitter.MAX_TWEET_LENGTH = 20
     twitter.TCO_LENGTH = 5
 
-    orig = u'url http://foo.co/bar ellipsize http://foo.co/baz'
-    expected = u'url http://foo.co/bar ellipsize…'
+    orig = 'url http://foo.co/bar ellipsize http://foo.co/baz'
+    expected = 'url http://foo.co/bar ellipsize…'
     result = self.twitter._truncate(
       orig, 'http://foo.com', source.OMIT_LINK, 'note', False)
-    self.assertEquals(expected, result)
+    self.assertEqual(expected, result)
 
-    orig = u'too long\nextra whitespace\tbut should include url'
-    expected = u'too long… http://obj.ca'
+    orig = 'too long\nextra whitespace\tbut should include url'
+    expected = 'too long… http://obj.ca'
     result = self.twitter._truncate(
       orig, 'http://obj.ca', source.INCLUDE_LINK, 'note', False)
-    self.assertEquals(expected, result)
+    self.assertEqual(expected, result)
 
-    orig = expected = u'trailing slash http://www.foo.co/'
+    orig = expected = 'trailing slash http://www.foo.co/'
     result = self.twitter._truncate(
       orig, 'http://www.foo.co/', source.OMIT_LINK, 'note', False)
-    self.assertEquals(expected, result)
+    self.assertEqual(expected, result)
 
   def test_no_ellipsize_real_tweet(self):
     self.maxDiff = None
@@ -1430,7 +1430,7 @@ def test_no_ellipsize_real_tweet(self):
 
     actual_preview = self.twitter.preview_create(
       obj, include_link=source.OMIT_LINK).content
-    self.assertEquals(preview, actual_preview)
+    self.assertEqual(preview, actual_preview)
 
     self.twitter.create(obj, include_link=source.OMIT_LINK)
 
@@ -1443,13 +1443,13 @@ def test_ellipsize_real_tweet(self):
             'far away. Those of us that have input fields to send webmentions '
             'manually may already be getting them')
 
-    content = (u'Hey #indieweb, the coming storm of webmention Spam may not '
-               u'be far away. Those of us that have input fields to send… '
-               u'https://ben.thatmustbe.me/note/2015/1/31/1/')
+    content = ('Hey #indieweb, the coming storm of webmention Spam may not '
+               'be far away. Those of us that have input fields to send… '
+               'https://ben.thatmustbe.me/note/2015/1/31/1/')
 
-    preview = (u'Hey #indieweb, the coming storm of webmention Spam may not '
-               u'be far away. Those of us that have input fields to send… '
-               u'<a href="https://ben.thatmustbe.me/note/2015/1/31/1/">ben.thatmustbe.me/note/2015/1/31...</a>')
+    preview = ('Hey #indieweb, the coming storm of webmention Spam may not '
+               'be far away. Those of us that have input fields to send… '
+               '<a href="https://ben.thatmustbe.me/note/2015/1/31/1/">ben.thatmustbe.me/note/2015/1/31...</a>')
 
     self.expect_urlopen(twitter.API_POST_TWEET, TWEET,
                         params={'status': content.encode('utf-8')})
@@ -1462,7 +1462,7 @@ def test_ellipsize_real_tweet(self):
 
     self.twitter.create(obj, include_link=source.INCLUDE_LINK)
     actual_preview = self.twitter.preview_create(obj, include_link=source.INCLUDE_LINK).content
-    self.assertEquals(preview, actual_preview)
+    self.assertEqual(preview, actual_preview)
 
   def test_tweet_article_has_different_format(self):
     """Articles are published with a slightly different format:
@@ -1473,7 +1473,7 @@ def test_tweet_article_has_different_format(self):
       'displayName': 'The Article Title',
       'url': 'http://example.com/article',
     }, include_link=source.INCLUDE_LINK).content
-    self.assertEquals(
+    self.assertEqual(
       'The Article Title: <a href="http://example.com/article">example.com/'
       'article</a>', preview)
 
@@ -1488,11 +1488,11 @@ def test_create_tweet_note_prefers_summary_then_content_then_name(self):
         'image': None,
         })
     result = self.twitter.preview_create(obj)
-    self.assertEquals('my summary', result.content)
+    self.assertEqual('my summary', result.content)
 
     del obj['summary']
     result = self.twitter.preview_create(obj)
-    self.assertEquals('my content', result.content)
+    self.assertEqual('my content', result.content)
 
     del obj['content']
     result = self.twitter.preview_create(obj)
@@ -1535,7 +1535,7 @@ def test_create_tweet_include_link(self):
         })
     self.twitter.create(obj, include_link=source.INCLUDE_LINK)
     result = self.twitter.preview_create(obj, include_link=source.INCLUDE_LINK)
-    self.assertIn(u'too long… <a href="http://obj.ca">obj.ca</a>',
+    self.assertIn('too long… <a href="http://obj.ca">obj.ca</a>',
                   result.content)
 
   def test_create_tweet_include_link_if_truncated(self):
@@ -1543,15 +1543,15 @@ def test_create_tweet_include_link_if_truncated(self):
     twitter.TCO_LENGTH = 5
 
     cases = [(
-      u'too long\nextra whitespace\tbut should include url',
-      u'http://obj.ca',
-      u'too long… http://obj.ca',
-      u'too long… <a href="http://obj.ca">obj.ca</a>',
+      'too long\nextra whitespace\tbut should include url',
+      'http://obj.ca',
+      'too long… http://obj.ca',
+      'too long… <a href="http://obj.ca">obj.ca</a>',
     ), (
-      u'short and sweet',
-      u'http://obj.ca',
-      u'short and sweet',
-      u'short and sweet',
+      'short and sweet',
+      'http://obj.ca',
+      'short and sweet',
+      'short and sweet',
     )]
 
     for _, _, expected, _ in cases:
@@ -1582,7 +1582,7 @@ def test_create_recognize_note(self):
         "author": [
           {
             "properties": {
-              "name": ["Tantek \u00c7elik"],
+              "name": ["Tantek \\u00c7elik"],
               "photo": ["http://tantek.com/logo.jpg"],
               "url": ["http://tantek.com/"]
             },
@@ -1695,7 +1695,7 @@ def test_create_reply(self):
       self.assert_equals(tweet, self.twitter.create(obj).content)
 
       preview = self.twitter.preview_create(obj)
-      self.assertEquals(status, preview.content)
+      self.assertEqual(status, preview.content)
       self.assertIn('<span class="verb">@-reply</span> to <a href="http://twitter.com/you/status/100">this tweet</a>:', preview.description)
 
   def test_create_reply_objectType_comment(self):
@@ -1708,7 +1708,7 @@ def test_create_reply_objectType_comment(self):
     # test preview
     preview = self.twitter.preview_create(obj)
     self.assertIn('<span class="verb">@-reply</span> to <a href="http://twitter.com/you/status/100">this tweet</a>:', preview.description)
-    self.assertEquals('@you my content', preview.content)
+    self.assertEqual('@you my content', preview.content)
 
     # test create
     self.expect_urlopen(twitter.API_POST_TWEET, {'url': 'http://posted/tweet'},
@@ -1741,7 +1741,7 @@ def test_create_reply_to_self_omits_mention(self):
       self.assertIn('@-reply</span> to <a href="%s">this tweet</a>:' %
                       obj['inReplyTo'][0]['url'],
                     preview.description)
-      self.assertEquals('my content', preview.content)
+      self.assertEqual('my content', preview.content)
 
       # test create
       self.assert_equals({'url': 'http://posted/tweet', 'type': 'comment'},
@@ -1826,12 +1826,12 @@ def test_create_with_multiple_photos(self):
       'image': [{'url': url} for url in image_urls],
     }
 
-    ellipsized = u"""\
+    ellipsized = """\
 the caption. extra long so we can check that it accounts for the pic-twitter-com link. almost at 140 chars, just…"""
     # test preview
     preview = self.twitter.preview_create(obj)
-    self.assertEquals('<span class="verb">tweet</span>:', preview.description)
-    self.assertEquals(ellipsized + '<br /><br />' +
+    self.assertEqual('<span class="verb">tweet</span>:', preview.description)
+    self.assertEqual(ellipsized + '<br /><br />' +
                       ' &nbsp; '.join('<img src="%s" />' % url
                                       for url in image_urls[:-1]),
                       preview.content)
@@ -1864,7 +1864,7 @@ def test_create_reply_with_photo(self):
     # test preview
     preview = self.twitter.preview_create(obj)
     self.assertIn('<span class="verb">@-reply</span> to <a href="http://twitter.com/you/status/100">this tweet</a>:', preview.description)
-    self.assertEquals('@you my content<br /><br /><img src="http://my/picture" />',
+    self.assertEqual('@you my content<br /><br /><img src="http://my/picture" />',
                       preview.content)
 
     # test create
@@ -1891,8 +1891,8 @@ def test_create_with_photo_no_content(self):
 
     # test preview
     preview = self.twitter.preview_create(obj)
-    self.assertEquals('<span class="verb">tweet</span>:', preview.description)
-    self.assertEquals('<br /><br /><img src="http://my/picture" />', preview.content)
+    self.assertEqual('<span class="verb">tweet</span>:', preview.description)
+    self.assertEqual('<br /><br /><img src="http://my/picture" />', preview.content)
 
     # test create
     self.expect_urlopen('http://my/picture', 'picture response')
@@ -1927,7 +1927,7 @@ def test_create_with_photo_error(self):
                           'media_ids': '123',
                         }, status=403)
     self.mox.ReplayAll()
-    self.assertRaises(urllib2.HTTPError, self.twitter.create, obj)
+    self.assertRaises(urllib.error.HTTPError, self.twitter.create, obj)
 
   def test_create_with_photo_wrong_type(self):
     obj = {
@@ -1940,7 +1940,7 @@ def test_create_with_photo_wrong_type(self):
     ret = self.twitter.create(obj)
     self.assertTrue(ret.abort)
     for msg in ret.error_plain, ret.error_html:
-      self.assertEquals('Twitter only supports JPG, PNG, GIF, and WEBP images; '
+      self.assertEqual('Twitter only supports JPG, PNG, GIF, and WEBP images; '
                         'http://my/picture.tiff looks like image/tiff', msg)
 
   def test_create_with_video(self):
@@ -1957,11 +1957,11 @@ def _test_create_with_video(self):
 the caption.\nextra long so we can check that it accounts for the pic-twitter-com link. <video xyz>should be removed. </video> almost at 140 chars, just type a little more, ok done.""",
       'stream': {'url': 'http://my/video'},
     }
-    ellipsized = u"""\
+    ellipsized = """\
 the caption. extra long so we can check that it accounts for the pic-twitter-com link. almost at 140 chars, just…"""
 
     # test preview
-    self.assertEquals(ellipsized +
+    self.assertEqual(ellipsized +
       '<br /><br /><video controls src="http://my/video">'
       '<a href="http://my/video">this video</a></video>',
       self.twitter.preview_create(obj).content)
diff --git a/granary/twitter.py b/granary/twitter.py
index 90380a5c..583cf331 100644
--- a/granary/twitter.py
+++ b/granary/twitter.py
@@ -15,23 +15,23 @@
 import collections
 import datetime
 import itertools
-import httplib
+import http.client
 import json
 import logging
 import mimetypes
 import re
 import socket
-import urllib
-import urllib2
-import urlparse
+import urllib.request, urllib.parse, urllib.error
+import urllib.request, urllib.error, urllib.parse
+import urllib.parse
 
-import appengine_config
+from . import appengine_config
 
 from bs4 import BeautifulSoup
 import requests
 import brevity
 
-import source
+from . import source
 from oauth_dropins import twitter_auth
 from oauth_dropins.webutil import util
 
@@ -241,7 +241,7 @@ def _user():
             activities += [self._make_like(tweet, _user()) for tweet in liked]
       elif group_id == source.SEARCH:
         url = API_SEARCH % {
-          'q': urllib.quote_plus(search_query),
+          'q': urllib.parse.quote_plus(search_query),
           'count': count,
         }
       elif group_id in (source.FRIENDS, source.ALL):
@@ -264,7 +264,7 @@ def _user():
         if group_id == source.SEARCH:
           tweet_obj = tweet_obj.get('statuses', [])
         tweets = tweet_obj[start_index:]
-      except urllib2.HTTPError, e:
+      except urllib.error.HTTPError as e:
         if e.code == 304:  # Not Modified, from a matching ETag
           tweets = []
         else:
@@ -312,7 +312,7 @@ def _user():
 
           try:
             tweet['retweets'] = self.urlopen(url)
-          except urllib2.URLError, e:
+          except urllib.error.URLError as e:
             code, _ = util.interpret_http_exception(e)
             if code != '404':  # 404 means the original tweet was deleted
               raise
@@ -340,7 +340,7 @@ def _user():
           url = HTML_FAVORITES % id
           try:
             html = json.loads(util.urlopen(url).read()).get('htmlUsers', '')
-          except urllib2.URLError, e:
+          except urllib.error.URLError as e:
             util.interpret_http_exception(e)  # just log it
             continue
           likes = self.favorites_html_to_likes(tweet, html)
@@ -392,7 +392,7 @@ def fetch_replies(self, activities, min_id=None):
         author = reply['actor']['username']
         if author not in mentions:
           url = API_SEARCH % {
-            'q': urllib.quote_plus('@' + author),
+            'q': urllib.parse.quote_plus('@' + author),
             'count': 100,
           }
           if min_id is not None:
@@ -431,7 +431,7 @@ def fetch_mentions(self, username, tweets, min_id=None):
     """
     # get @-name mentions
     url = API_SEARCH % {
-      'q': urllib.quote_plus('@' + username),
+      'q': urllib.parse.quote_plus('@' + username),
       'count': 100,
     }
     if min_id is not None:
@@ -468,11 +468,11 @@ def fetch_mentions(self, username, tweets, min_id=None):
     # https://dev.twitter.com/rest/public/search
     for batch in [
         tweets[i:i + QUOTE_SEARCH_BATCH_SIZE]
-        for i in xrange(0, len(tweets), QUOTE_SEARCH_BATCH_SIZE)
+        for i in range(0, len(tweets), QUOTE_SEARCH_BATCH_SIZE)
     ]:
       batch_ids = [t['id_str'] for t in batch]
       url = API_SEARCH % {
-        'q': urllib.quote_plus(' OR '.join(batch_ids)),
+        'q': urllib.parse.quote_plus(' OR '.join(batch_ids)),
         'count': 100,
       }
       if min_id is not None:
@@ -608,7 +608,7 @@ def _create(self, obj, preview=None, include_link=source.OMIT_LINK,
       # TODO: this doesn't handle an in-reply-to username that's a prefix of
       # another username already mentioned, e.g. in reply to @foo when content
       # includes @foobar.
-      parsed = urlparse.urlparse(base_url)
+      parsed = urllib.parse.urlparse(base_url)
       parts = parsed.path.split('/')
       if len(parts) < 2 or not parts[1]:
         raise ValueError('Could not determine author of in-reply-to URL %s' % base_url)
@@ -622,7 +622,7 @@ def _create(self, obj, preview=None, include_link=source.OMIT_LINK,
       # hard-code it to twitter.com. index #1 is netloc.
       parsed = list(parsed)
       parsed[1] = self.DOMAIN
-      base_url = urlparse.urlunparse(parsed)
+      base_url = urllib.parse.urlunparse(parsed)
 
     # need a base_url with the tweet id for the embed HTML below. do this
     # *after* checking the real base_url for in-reply-to author username.
@@ -660,7 +660,7 @@ def _create(self, obj, preview=None, include_link=source.OMIT_LINK,
           description='<span class="verb">favorite</span> <a href="%s">'
                       'this tweet</a>:\n%s' % (base_url, self.embed_post(base_obj)))
       else:
-        data = urllib.urlencode({'id': base_id})
+        data = urllib.parse.urlencode({'id': base_id})
         self.urlopen(API_POST_FAVORITE, data=data)
         resp = {'type': 'like'}
 
@@ -678,12 +678,12 @@ def _create(self, obj, preview=None, include_link=source.OMIT_LINK,
           description='<span class="verb">retweet</span> <a href="%s">'
                       'this tweet</a>:\n%s' % (base_url, self.embed_post(base_obj)))
       else:
-        data = urllib.urlencode({'id': base_id})
+        data = urllib.parse.urlencode({'id': base_id})
         resp = self.urlopen(API_POST_RETWEET % base_id, data=data)
         resp['type'] = 'repost'
 
     elif type in ('note', 'article') or is_reply:  # a tweet
-      content = unicode(content).encode('utf-8')
+      content = str(content).encode('utf-8')
       data = {'status': content}
 
       if is_reply:
@@ -727,7 +727,7 @@ def _create(self, obj, preview=None, include_link=source.OMIT_LINK,
       if preview:
         return source.creation_result(content=preview_content, description=description)
       else:
-        resp = self.urlopen(API_POST_TWEET, data=urllib.urlencode(data))
+        resp = self.urlopen(API_POST_TWEET, data=urllib.parse.urlencode(data))
         resp['type'] = 'comment' if is_reply else 'post'
 
     elif (verb and verb.startswith('rsvp-')) or verb == 'invite':
@@ -805,7 +805,7 @@ def upload_images(self, urls):
       logging.info('Got: %s', resp.text)
       try:
         ids.append(json.loads(resp.text)['media_id_string'])
-      except ValueError, KeyError:
+      except ValueError as KeyError:
         logging.exception("Couldn't parse response: %s", resp.text)
         raise
 
@@ -844,7 +844,7 @@ def upload_video(self, url):
       return source.creation_result(abort=True, error_plain=msg, error_html=msg)
 
     # INIT
-    media_id = self.urlopen(API_UPLOAD_MEDIA, data=urllib.urlencode({
+    media_id = self.urlopen(API_UPLOAD_MEDIA, data=urllib.parse.urlencode({
       'command': 'INIT',
       'media_type': 'video/mp4',
       'total_bytes': length,
@@ -871,7 +871,7 @@ def upload_video(self, url):
       i += 1
 
     # FINALIZE
-    self.urlopen(API_UPLOAD_MEDIA, data=urllib.urlencode({
+    self.urlopen(API_UPLOAD_MEDIA, data=urllib.parse.urlencode({
       'command': 'FINALIZE',
       'media_id': media_id,
     }))
@@ -914,22 +914,22 @@ def request():
         except (ValueError, TypeError):
           msg = 'Non-JSON response! (Synthetic HTTP error generated by Bridgy.)'
           logging.exception(msg)
-          raise urllib2.HTTPError(API_BASE + url, 503, msg, {}, None)
+          raise urllib.error.HTTPError(API_BASE + url, 503, msg, {}, None)
       else:
         return resp
 
     if ('data' not in kwargs and not
-        (isinstance(url, urllib2.Request) and url.get_method() == 'POST')):
+        (isinstance(url, urllib.request.Request) and url.get_method() == 'POST')):
       # this is a GET. retry up to 3x if we deadline.
       for attempt in range(RETRIES):
         try:
           return request()
-        except httplib.HTTPException, e:
+        except http.client.HTTPException as e:
           if not str(e).startswith('Deadline exceeded'):
             raise
-        except socket.error, e:
+        except socket.error as e:
           pass
-        except urllib2.HTTPError, e:
+        except urllib.error.HTTPError as e:
           code, body = util.interpret_http_exception(e)
           if code is None or int(code) / 100 != 5:
             raise
@@ -954,14 +954,14 @@ def base_object(self, obj):
     url = base_obj.get('url')
     if url:
       try:
-        parsed = urlparse.urlparse(url)
+        parsed = urllib.parse.urlparse(url)
         parts = parsed.path.split('/')
         if len(parts) >= 3 and parts[-2] == 'photo':
           base_obj['id'] = parts[-3]
           parsed = list(parsed)
           parsed[2] = '/'.join(parts[:-2])
-          base_obj['url'] = urlparse.urlunparse(parsed)
-      except BaseException, e:
+          base_obj['url'] = urllib.parse.urlunparse(parsed)
+      except BaseException as e:
         logging.error(
           "Couldn't parse object URL %s : %s. Falling back to default logic.",
           url, e)
@@ -1104,7 +1104,7 @@ def tweet_to_object(self, tweet):
         'displayName': '',
         'indices': t['indices'],
       } for t in media if t.get('indices')}
-    obj['tags'].extend(indices_to_media.values())
+    obj['tags'].extend(list(indices_to_media.values()))
 
     # sort tags by indices, since they need to be processed (below) in order.
     obj['tags'].sort(key=lambda t: t.get('indices'))
@@ -1170,7 +1170,7 @@ def _get_entities(tweet):
 
     for field in 'entities', 'extended_entities':
       # kind is media, urls, hashtags, user_mentions, symbols, etc
-      for kind, values in tweet.get(field, {}).items():
+      for kind, values in list(tweet.get(field, {}).items()):
         for v in values:
           id = v.get('id_str') or v.get('id') or v.get('url') or v.get('text')
           if id in seen_ids[kind]: