From 7473785b5cd986baf5d6fd8aa1f47efa2a63eeaa Mon Sep 17 00:00:00 2001
From: Charmander <~@charmander.me>
Date: Wed, 26 Jun 2024 01:10:53 +0000
Subject: [PATCH] Remove some Python 2 compatibility leftovers (#1415)

---
 libweasyl/files.py                            |  6 +-
 libweasyl/models/media.py                     |  2 +-
 libweasyl/models/tables.py                    |  8 +-
 libweasyl/ratings.py                          |  2 +-
 libweasyl/test/test_files.py                  |  2 +-
 libweasyl/test/test_text.py                   | 54 ++++++-------
 libweasyl/text.py                             | 78 +++++++++----------
 weasyl-apidocs/source/conf.py                 | 16 ++--
 weasyl/commishinfo.py                         |  2 +-
 weasyl/configuration_builder.py               |  6 +-
 weasyl/controllers/moderation.py              |  2 +-
 weasyl/controllers/profile.py                 | 14 ++--
 weasyl/define.py                              |  4 +-
 weasyl/middleware.py                          | 14 ++--
 weasyl/orm.py                                 |  4 +-
 weasyl/pagination.py                          |  2 +-
 weasyl/profile.py                             |  8 +-
 weasyl/search.py                              |  2 +-
 weasyl/test/login/test_authenticate_bcrypt.py | 16 ++--
 weasyl/test/login/test_create.py              |  2 +-
 weasyl/test/login/test_password_secure.py     |  8 +-
 weasyl/test/test_comment.py                   |  2 +-
 weasyl/test/test_define.py                    |  2 +-
 weasyl/test/test_search.py                    | 56 ++++++-------
 weasyl/test/test_submission.py                |  2 +-
 weasyl/test/test_two_factor_auth.py           |  2 +-
 weasyl/test/web/test_characters.py            | 24 +++---
 weasyl/test/web/test_journals.py              | 28 +++----
 weasyl/test/web/test_site_updates.py          | 24 +++---
 weasyl/test/web/test_submissions.py           | 10 +--
 30 files changed, 201 insertions(+), 201 deletions(-)

diff --git a/libweasyl/files.py b/libweasyl/files.py
index 857b9beaa..f58436b8d 100644
--- a/libweasyl/files.py
+++ b/libweasyl/files.py
@@ -98,9 +98,9 @@ def file_type_for_category(data, category):
         except SanperaError:
             raise UnknownFileFormat('The image data provided could not be decoded.')
         fmt = im.original_format.decode()
-        if fmt == u'JPEG':
-            fmt = u'JPG'
-        if fmt not in {u'GIF', u'JPG', u'PNG'}:
+        if fmt == 'JPEG':
+            fmt = 'JPG'
+        if fmt not in {'GIF', 'JPG', 'PNG'}:
             raise InvalidFileFormat('Image files must be in the GIF, JPG, or PNG formats.')
         return im, str(fmt.lower())
     elif category == Category.literary:
diff --git a/libweasyl/models/media.py b/libweasyl/models/media.py
index 777ad599d..221b1c9b4 100644
--- a/libweasyl/models/media.py
+++ b/libweasyl/models/media.py
@@ -94,7 +94,7 @@ def file_url(self):
         return '/' + '/'.join(self._file_path_components)
 
 
-class _LinkMixin(object):
+class _LinkMixin:
     cache_func = None
 
     @classmethod
diff --git a/libweasyl/models/tables.py b/libweasyl/models/tables.py
index b151ef2b0..40c14f80f 100644
--- a/libweasyl/models/tables.py
+++ b/libweasyl/models/tables.py
@@ -239,7 +239,7 @@ def default_fkey(*args, **kwargs):
     Column('height', String(length=100), nullable=False, server_default=''),
     Column('weight', String(length=100), nullable=False, server_default=''),
     Column('species', String(length=100), nullable=False, server_default=''),
-    Column('content', String(length=100000), nullable=False, server_default=u""),
+    Column('content', String(length=100000), nullable=False, server_default=""),
     Column('rating', RatingColumn, nullable=False),
     Column('settings', CharSettingsColumn({}, length=20), nullable=False, server_default=''),
     Column('hidden', Boolean(), nullable=False, server_default='f'),
@@ -365,7 +365,7 @@ def default_fkey(*args, **kwargs):
     'media', metadata,
     Column('mediaid', Integer(), primary_key=True, nullable=False),
     Column('file_type', String(length=8), nullable=False),
-    Column('attributes', JSONValuesColumn(), nullable=False, server_default=text(u"''::hstore")),
+    Column('attributes', JSONValuesColumn(), nullable=False, server_default=text("''::hstore")),
     Column('sha256', String(length=64)),
 )
 
@@ -655,7 +655,7 @@ def default_fkey(*args, **kwargs):
     Column('created_at', ArrowColumn(), nullable=False, server_default=text('now()')),
     Column('last_active', TIMESTAMP(timezone=True), nullable=True, server_default=func.now()),
     Column('userid', Integer()),
-    Column('additional_data', JSONValuesColumn(), nullable=False, server_default=text(u"''::hstore")),
+    Column('additional_data', JSONValuesColumn(), nullable=False, server_default=text("''::hstore")),
     Column('ip_address', String(length=39), nullable=True),
     Column('user_agent_id', Integer(), nullable=True),
     default_fkey(['userid'], ['login.userid'], name='sessions_userid_fkey'),
@@ -825,7 +825,7 @@ def _tag_suggestion_feedback_table(content_table, id_column):
     Column('added', ARRAY(Text())),
     Column('removed', ARRAY(Text())),
     Column('updated_at', Integer(), nullable=False,
-           server_default=text(u"(date_part('epoch'::text, now()) - (18000)::double precision)")),
+           server_default=text("(date_part('epoch'::text, now()) - (18000)::double precision)")),
     default_fkey(['submitid'], ['submission.submitid'], name='tag_updates_submitid_fkey'),
     ForeignKeyConstraint(['userid'], ['login.userid'], name='tag_updates_userid_fkey'),
 )
diff --git a/libweasyl/ratings.py b/libweasyl/ratings.py
index bc00b5251..5ecc67e0a 100644
--- a/libweasyl/ratings.py
+++ b/libweasyl/ratings.py
@@ -2,7 +2,7 @@
 
 
 @functools.total_ordering
-class Rating(object):
+class Rating:
     def __init__(self, code, character, name, nice_name, minimum_age, block_text,
                  additional_description=None):
 
diff --git a/libweasyl/test/test_files.py b/libweasyl/test/test_files.py
index 08315ea7e..a88680318 100644
--- a/libweasyl/test/test_files.py
+++ b/libweasyl/test/test_files.py
@@ -117,4 +117,4 @@ def test_file_type_for_category_literary_results():
     """
     Non-PDF UTF-8 documents are returned decoded.
     """
-    assert files.file_type_for_category(b'hello\xc3\xbfworld', Category.literary) == (u'hello\xffworld', 'txt')
+    assert files.file_type_for_category(b'hello\xc3\xbfworld', Category.literary) == ('hello\xffworld', 'txt')
diff --git a/libweasyl/test/test_text.py b/libweasyl/test/test_text.py
index 959811ecb..17e87473e 100644
--- a/libweasyl/test/test_text.py
+++ b/libweasyl/test/test_text.py
@@ -125,17 +125,17 @@ def test_markdown_respect_ordered_list_start():
 
 
 def test_markdown_strikethrough():
-    assert markdown(u"~~test~~") == u"<p><del>test</del></p>\n"
+    assert markdown("~~test~~") == "<p><del>test</del></p>\n"
 
 
 @pytest.mark.parametrize(('target', 'expected'), [
-    (u"[external](http://example.com/)", u'<a href="http://example.com/" rel="nofollow ugc">external</a>'),
-    (u'<a href="http://example.com/">external</a>', u'<a href="http://example.com/" rel="nofollow ugc">external</a>'),
-    (u'<a href="http://example.com/" rel="noreferrer">external</a>', u'<a href="http://example.com/" rel="nofollow ugc">external</a>'),
-    (u"[external](//example.com/)", u'<a href="//example.com/" rel="nofollow ugc">external</a>'),
+    ("[external](http://example.com/)", '<a href="http://example.com/" rel="nofollow ugc">external</a>'),
+    ('<a href="http://example.com/">external</a>', '<a href="http://example.com/" rel="nofollow ugc">external</a>'),
+    ('<a href="http://example.com/" rel="noreferrer">external</a>', '<a href="http://example.com/" rel="nofollow ugc">external</a>'),
+    ("[external](//example.com/)", '<a href="//example.com/" rel="nofollow ugc">external</a>'),
 ])
 def test_markdown_external_link_noreferrer(target, expected):
-    assert markdown(target) == u"<p>%s</p>\n" % (expected,)
+    assert markdown(target) == "<p>%s</p>\n" % (expected,)
 
 
 markdown_link_tests = [
@@ -151,28 +151,28 @@ def test_markdown_link(target, expected):
 
 
 def test_tag_stripping():
-    assert markdown(u"<button>text</button>") == u"<p>text</p>\n"
-    assert markdown(u"<button><button>text</button></button>") == u"<p>text</p>\n"
-    assert markdown(u"<!--[if IE]><script>alert(1)</script><![endif]-->") == u"\n"
+    assert markdown("<button>text</button>") == "<p>text</p>\n"
+    assert markdown("<button><button>text</button></button>") == "<p>text</p>\n"
+    assert markdown("<!--[if IE]><script>alert(1)</script><![endif]-->") == "\n"
 
 
 markdown_excerpt_tests = [
-    (u'', u''),
-    (u'short', u'short'),
-    (u'just short enoughAAAAAAAAAAAAA', u'just short enoughAAAAAAAAAAAAA'),
-    (u'not short enoughAAAAAAAAAAAAAAA', u'not short enoughAAAAAAAAAAAAA…'),
-    (u'*leading* inline formatting', u'leading inline formatting'),
-    (u'middle *inline* formatting', u'middle inline formatting'),
-    (u'trailing inline *formatting*', u'trailing inline formatting'),
-    (u'*nested **inline** formatting*', u'nested inline formatting'),
-    (u'   unnecessary  whitespace\t', u'unnecessary whitespace'),
-    (u'multiple\nlines', u'multiple lines'),
-    (u'multiple  \nlines', u'multiple lines'),
-    (u'multiple\n\nparagraphs', u'multiple paragraphs'),
-    (u'Üñíçôđe\N{COMBINING ACUTE ACCENT}', u'Üñíçôđe\N{COMBINING ACUTE ACCENT}'),
-    (u'single-codepoint graphemes😊😊😊😊', u'single-codepoint graphemes😊😊😊😊'),
-    (u'single-codepoint graphemes😊😊😊😊😊', u'single-codepoint graphemes😊😊😊…'),
-    (u'test\n - lists\n - of\n - items\n\ntest', u'test lists of items test'),
+    ('', ''),
+    ('short', 'short'),
+    ('just short enoughAAAAAAAAAAAAA', 'just short enoughAAAAAAAAAAAAA'),
+    ('not short enoughAAAAAAAAAAAAAAA', 'not short enoughAAAAAAAAAAAAA…'),
+    ('*leading* inline formatting', 'leading inline formatting'),
+    ('middle *inline* formatting', 'middle inline formatting'),
+    ('trailing inline *formatting*', 'trailing inline formatting'),
+    ('*nested **inline** formatting*', 'nested inline formatting'),
+    ('   unnecessary  whitespace\t', 'unnecessary whitespace'),
+    ('multiple\nlines', 'multiple lines'),
+    ('multiple  \nlines', 'multiple lines'),
+    ('multiple\n\nparagraphs', 'multiple paragraphs'),
+    ('Üñíçôđe\N{COMBINING ACUTE ACCENT}', 'Üñíçôđe\N{COMBINING ACUTE ACCENT}'),
+    ('single-codepoint graphemes😊😊😊😊', 'single-codepoint graphemes😊😊😊😊'),
+    ('single-codepoint graphemes😊😊😊😊😊', 'single-codepoint graphemes😊😊😊…'),
+    ('test\n - lists\n - of\n - items\n\ntest', 'test lists of items test'),
     ('<div style="text-align: center">**foo**</div>\n<!-- comment -->', "foo"),
     ('1 < 3 > 2 "foo"', '1 < 3 > 2 "foo"'),
     ("&copy;", "©"),
@@ -189,5 +189,5 @@ def test_excerpt(target, expected):
 
 
 def test_excerpt_default_length():
-    assert markdown_excerpt(u'a' * 300) == u'a' * 300
-    assert markdown_excerpt(u'a' * 301) == u'a' * 299 + u'…'
+    assert markdown_excerpt('a' * 300) == 'a' * 300
+    assert markdown_excerpt('a' * 301) == 'a' * 299 + '…'
diff --git a/libweasyl/text.py b/libweasyl/text.py
index e32465c7b..2be571c4a 100644
--- a/libweasyl/text.py
+++ b/libweasyl/text.py
@@ -72,7 +72,7 @@ def _sofurry(target):
 def strip_outer_tag(html):
     match = locatestarttagend.match(html)
     start_tag_end = match.end()
-    end_tag_start = html.rindex(u'<')
+    end_tag_start = html.rindex('<')
     return html[:start_tag_end + 1], html[start_tag_end + 1:end_tag_start], html[end_tag_start:]
 
 
@@ -82,7 +82,7 @@ def block_html(self, raw_html):
         if raw_html.startswith('<!--'):
             return raw_html
         start, stripped, end = strip_outer_tag(raw_html)
-        return u''.join([start, _markdown(stripped).rstrip(), end])
+        return ''.join([start, _markdown(stripped).rstrip(), end])
 
     def autolink(self, link, is_email):
         # default implementation from sundown’s `rndr_autolink`, with the tag name replaced
@@ -111,31 +111,29 @@ def _markdown(target):
 
 
 def create_link(t, username):
-    link = etree.Element(u"a")
-    link.set(u"href", u"/~" + get_sysname(username))
+    link = etree.Element("a")
+    link.set("href", "/~" + get_sysname(username))
 
     if t == "~":
         link.text = username
     else:
-        link.set(u"class", u"user-icon")
+        link.set("class", "user-icon")
 
-        image = etree.SubElement(link, u"img")
-        image.set(u"src", u"/~{username}/avatar".format(username=get_sysname(username)))
+        image = etree.SubElement(link, "img")
+        image.set("src", "/~{username}/avatar".format(username=get_sysname(username)))
 
         if t == "!":
             image.set("alt", username)
         else:
             image.set("alt", "")
-            label = etree.SubElement(link, u"span")
+            label = etree.SubElement(link, "span")
             label.text = username
-            image.tail = u" "
+            image.tail = " "
 
     return link
 
 
 def add_user_links(fragment, parent, can_contain):
-    _nonlocal = {}
-
     def add_matches(text, got_link):
         text_start = 0
 
@@ -163,7 +161,8 @@ def add_matches(text, got_link):
         return True
 
     def got_text_link(t, username):
-        previous = _nonlocal["previous"]
+        nonlocal previous
+        nonlocal insert_index
 
         if previous is None:
             fragment.text = "".join(previous_text)
@@ -173,20 +172,23 @@ def got_text_link(t, username):
         del previous_text[:]
 
         link = create_link(t, username)
-        fragment.insert(_nonlocal["insert_index"], link)
-        _nonlocal["insert_index"] += 1
+        fragment.insert(insert_index, link)
+        insert_index += 1
 
-        _nonlocal["previous"] = link
+        previous = link
 
     def got_tail_link(t, username):
-        _nonlocal["previous"].tail = "".join(previous_text)
+        nonlocal previous
+        nonlocal insert_index
+
+        previous.tail = "".join(previous_text)
         del previous_text[:]
 
-        _nonlocal["insert_index"] += 1
+        insert_index += 1
         link = create_link(t, username)
-        parent.insert(_nonlocal["insert_index"], link)
+        parent.insert(insert_index, link)
 
-        _nonlocal["previous"] = link
+        previous = link
 
     if can_contain:
         for child in list(fragment):
@@ -194,25 +196,23 @@ def got_tail_link(t, username):
             add_user_links(child, fragment, child_can_contain)
 
         if fragment.text:
-            _nonlocal["previous"] = None
-            _nonlocal["insert_index"] = 0
+            previous = None
+            insert_index = 0
             previous_text = []
 
             if add_matches(fragment.text, got_text_link):
-                previous = _nonlocal["previous"]
-
                 if previous is None:
                     fragment.text = "".join(previous_text)
                 else:
                     previous.tail = "".join(previous_text)
 
     if fragment.tail:
-        _nonlocal["previous"] = fragment
-        _nonlocal["insert_index"] = parent.index(fragment)
+        previous = fragment
+        insert_index = parent.index(fragment)
         previous_text = []
 
         if add_matches(fragment.tail, got_tail_link):
-            _nonlocal["previous"].tail = "".join(previous_text)
+            previous.tail = "".join(previous_text)
 
 
 def _convert_autolinks(fragment):
@@ -226,15 +226,15 @@ def _convert_autolinks(fragment):
                 t, _, user = href.partition(":")
 
                 if t == "user":
-                    link.set("href", u"/~{user}".format(user=get_sysname(user)))
+                    link.set("href", "/~{user}".format(user=get_sysname(user)))
                 elif t == "da":
-                    link.set("href", u"https://www.deviantart.com/{user}".format(user=_deviantart(user)))
+                    link.set("href", "https://www.deviantart.com/{user}".format(user=_deviantart(user)))
                 elif t == "ib":
-                    link.set("href", u"https://inkbunny.net/{user}".format(user=_inkbunny(user)))
+                    link.set("href", "https://inkbunny.net/{user}".format(user=_inkbunny(user)))
                 elif t == "fa":
-                    link.set("href", u"https://www.furaffinity.net/user/{user}".format(user=_furaffinity(user)))
+                    link.set("href", "https://www.furaffinity.net/user/{user}".format(user=_furaffinity(user)))
                 elif t == "sf":
-                    link.set("href", u"https://{user}.sofurry.com/".format(user=_sofurry(user)))
+                    link.set("href", "https://{user}.sofurry.com/".format(user=_sofurry(user)))
                 else:
                     continue
 
@@ -256,26 +256,26 @@ def _markdown_fragment(target):
         t, _, user = src.partition(":")
 
         if t != "user":
-            link = etree.Element(u"a")
+            link = etree.Element("a")
             link.tail = image.tail
-            link.set(u"href", src)
+            link.set("href", src)
             link.text = image.get("alt", src)
             image.getparent().replace(image, link)
             continue
 
-        image.set(u"src", u"/~{user}/avatar".format(user=get_sysname(user)))
+        image.set("src", "/~{user}/avatar".format(user=get_sysname(user)))
 
-        link = etree.Element(u"a")
-        link.set(u"href", u"/~{user}".format(user=get_sysname(user)))
-        link.set(u"class", u"user-icon")
+        link = etree.Element("a")
+        link.set("href", "/~{user}".format(user=get_sysname(user)))
+        link.set("class", "user-icon")
         link.tail = image.tail
         image.getparent().replace(image, link)
         link.append(image)
 
         alt = image.get("alt")
         if alt:
-            image.tail = u" "
-            label = etree.SubElement(link, u"span")
+            image.tail = " "
+            label = etree.SubElement(link, "span")
             label.text = alt
             del image.attrib["alt"]
         else:
diff --git a/weasyl-apidocs/source/conf.py b/weasyl-apidocs/source/conf.py
index eebbd18d2..415665a8b 100644
--- a/weasyl-apidocs/source/conf.py
+++ b/weasyl-apidocs/source/conf.py
@@ -43,8 +43,8 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'Weasyl API'
-copyright = u'2016, weykent'
+project = 'Weasyl API'
+copyright = '2016, weykent'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
@@ -186,8 +186,8 @@
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, documentclass [howto/manual]).
 latex_documents = [
-  ('index', 'WeasylAPI.tex', u'Weasyl API Documentation',
-   u'weykent', 'manual'),
+  ('index', 'WeasylAPI.tex', 'Weasyl API Documentation',
+   'weykent', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -216,8 +216,8 @@
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
 man_pages = [
-    ('index', 'weasylapi', u'Weasyl API Documentation',
-     [u'weykent'], 1)
+    ('index', 'weasylapi', 'Weasyl API Documentation',
+     ['weykent'], 1)
 ]
 
 # If true, show URL addresses after external links.
@@ -230,8 +230,8 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'WeasylAPI', u'Weasyl API Documentation',
-   u'weykent', 'WeasylAPI', 'One line description of project.',
+  ('index', 'WeasylAPI', 'Weasyl API Documentation',
+   'weykent', 'WeasylAPI', 'One line description of project.',
    'Miscellaneous'),
 ]
 
diff --git a/weasyl/commishinfo.py b/weasyl/commishinfo.py
index 0851d229d..69f9b4aa0 100644
--- a/weasyl/commishinfo.py
+++ b/weasyl/commishinfo.py
@@ -311,7 +311,7 @@ def prepare(info):
         dinfo['localmax'] = convert_currency(info.pricemax, info.pricesettings, currency)
         if tags:
             terms = ["user:" + d.get_sysname(info.username)] + ["|" + tag for tag in tags]
-            dinfo['searchquery'] = "q=" + urlquote(u" ".join(terms).encode("utf-8"))
+            dinfo['searchquery'] = "q=" + urlquote(" ".join(terms).encode("utf-8"))
         else:
             dinfo['searchquery'] = ""
         return dinfo
diff --git a/weasyl/configuration_builder.py b/weasyl/configuration_builder.py
index 1f0765040..be486f047 100644
--- a/weasyl/configuration_builder.py
+++ b/weasyl/configuration_builder.py
@@ -1,6 +1,6 @@
 # TODO(kailys): Doc and create examples
 
-class ConfigOption(object):
+class ConfigOption:
     "A class representing options for ``Config``."
 
     def __init__(self, name, value_map):
@@ -41,7 +41,7 @@ class InvalidValue(ValueError):
     pass
 
 
-class ConfigAttribute(object):
+class ConfigAttribute:
     def __init__(self, option):
         self.option = option
 
@@ -56,7 +56,7 @@ def __set__(self, instance, value):
         instance._values[self.option.name] = value
 
 
-class BaseConfig(object):
+class BaseConfig:
     _options = {}
     _options_by_code = {}
     all_option_codes = ''
diff --git a/weasyl/controllers/moderation.py b/weasyl/controllers/moderation.py
index c8e621618..e6923da40 100644
--- a/weasyl/controllers/moderation.py
+++ b/weasyl/controllers/moderation.py
@@ -168,7 +168,7 @@ def modcontrol_copynotetostaffnotes_post_(request):
 
     notedata = note.select_view(request.userid, int(form.noteid))
 
-    staff_note_title = u"Received note from {sender}, dated {date}, with subject: “{subj}”.".format(
+    staff_note_title = "Received note from {sender}, dated {date}, with subject: “{subj}”.".format(
         sender=notedata['sendername'],
         date=arrow.get(notedata['unixtime']).format('YYYY-MM-DD HH:mm:ss ZZ'),
         subj=notedata['title'],
diff --git a/weasyl/controllers/profile.py b/weasyl/controllers/profile.py
index 7527ca32e..c7d611b8a 100644
--- a/weasyl/controllers/profile.py
+++ b/weasyl/controllers/profile.py
@@ -177,7 +177,7 @@ def submissions_(request):
 
     userprofile = profile.select_profile(otherid, viewer=request.userid)
     has_fullname = userprofile['full_name'] is not None and userprofile['full_name'].strip() != ''
-    page_title = u"%s's submissions" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
+    page_title = "%s's submissions" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
     page = define.common_page_start(request.userid, title=page_title)
 
     url_format = "/submissions/{username}?%s{folderquery}".format(
@@ -227,7 +227,7 @@ def collections_(request):
 
     userprofile = profile.select_profile(otherid, viewer=request.userid)
     has_fullname = userprofile['full_name'] is not None and userprofile['full_name'].strip() != ''
-    page_title = u"%s's collections" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
+    page_title = "%s's collections" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
     page = define.common_page_start(request.userid, title=page_title)
 
     url_format = "/collections?userid={userid}&%s".format(userid=userprofile['userid'])
@@ -266,7 +266,7 @@ def journals_(request):
 
     userprofile = profile.select_profile(otherid, viewer=request.userid)
     has_fullname = userprofile['full_name'] is not None and userprofile['full_name'].strip() != ''
-    page_title = u"%s's journals" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
+    page_title = "%s's journals" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
     page = define.common_page_start(request.userid, title=page_title)
 
     relation = profile.select_relation(request.userid, otherid)
@@ -303,7 +303,7 @@ def characters_(request):
 
     userprofile = profile.select_profile(otherid, viewer=request.userid)
     has_fullname = userprofile['full_name'] is not None and userprofile['full_name'].strip() != ''
-    page_title = u"%s's characters" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
+    page_title = "%s's characters" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
     page = define.common_page_start(request.userid, title=page_title)
 
     url_format = "/characters?userid={userid}&%s".format(userid=userprofile['userid'])
@@ -357,7 +357,7 @@ def shouts_(request):
         )
 
     has_fullname = userprofile['full_name'] is not None and userprofile['full_name'].strip() != ''
-    page_title = u"%s's shouts" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
+    page_title = "%s's shouts" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
     page = define.common_page_start(request.userid, title=page_title)
 
     relation = profile.select_relation(request.userid, otherid)
@@ -391,7 +391,7 @@ def staffnotes_(request):
 
     userprofile = profile.select_profile(otherid, viewer=request.userid)
     has_fullname = userprofile['full_name'] is not None and userprofile['full_name'].strip() != ''
-    page_title = u"%s's staff notes" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
+    page_title = "%s's staff notes" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
     page = define.common_page_start(request.userid, title=page_title)
 
     userinfo = profile.select_userinfo(otherid, config=userprofile['config'])
@@ -443,7 +443,7 @@ def favorites_(request):
 
     userprofile = profile.select_profile(otherid, viewer=request.userid)
     has_fullname = userprofile['full_name'] is not None and userprofile['full_name'].strip() != ''
-    page_title = u"%s's favorites" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
+    page_title = "%s's favorites" % (userprofile['full_name'] if has_fullname else userprofile['username'],)
     page = define.common_page_start(request.userid, title=page_title)
 
     if feature:
diff --git a/weasyl/define.py b/weasyl/define.py
index 792f5689b..afe35133f 100644
--- a/weasyl/define.py
+++ b/weasyl/define.py
@@ -114,7 +114,7 @@ def column(results):
     return [x for x, in results]
 
 
-_PG_SERIALIZATION_FAILURE = u'40001'
+_PG_SERIALIZATION_FAILURE = '40001'
 
 
 def serializable_retry(action, limit=16):
@@ -918,7 +918,7 @@ def absolutify_url(url):
 
 def summarize(s, max_length=200):
     if len(s) > max_length:
-        return s[:max_length - 1].rstrip() + u'\N{HORIZONTAL ELLIPSIS}'
+        return s[:max_length - 1].rstrip() + '\N{HORIZONTAL ELLIPSIS}'
     return s
 
 
diff --git a/weasyl/middleware.py b/weasyl/middleware.py
index 306fa8896..f075021a1 100644
--- a/weasyl/middleware.py
+++ b/weasyl/middleware.py
@@ -232,7 +232,7 @@ def callback(request, response):
         if not hasattr(request, 'weasyl_session') or request.userid not in staff.DEVELOPERS:
             return
 
-        class ParameterCounter(object):
+        class ParameterCounter:
             def __init__(self):
                 self.next = 1
                 self.ids = {}
@@ -244,18 +244,18 @@ def __getitem__(self, name):
                     id = self.ids[name] = self.next
                     self.next += 1
 
-                return u'$%i' % (id,)
+                return '$%i' % (id,)
 
         debug_rows = []
 
         for statement, t in request.query_debug:
-            statement = u' '.join(statement.split()).replace(u'( ', u'(').replace(u' )', u')') % ParameterCounter()
-            debug_rows.append(u'<tr><td>%.1f ms</td><td><code>%s</code></td></tr>' % (t * 1000, html.escape(statement)))
+            statement = ' '.join(statement.split()).replace('( ', '(').replace(' )', ')') % ParameterCounter()
+            debug_rows.append('<tr><td>%.1f ms</td><td><code>%s</code></td></tr>' % (t * 1000, html.escape(statement)))
 
-        response.text += u''.join(
-            [u'<table style="background: white; border-collapse: separate; border-spacing: 1em; table-layout: auto; margin: 1em; font-family: sans-serif">']
+        response.text += ''.join(
+            ['<table style="background: white; border-collapse: separate; border-spacing: 1em; table-layout: auto; margin: 1em; font-family: sans-serif">']
             + debug_rows
-            + [u'</table>']
+            + ['</table>']
         )
 
     def query_debug_tween(request):
diff --git a/weasyl/orm.py b/weasyl/orm.py
index 5f46adc22..ca99cd2b2 100644
--- a/weasyl/orm.py
+++ b/weasyl/orm.py
@@ -7,11 +7,11 @@
 
 # TODO: Implement these are real models in libweasyl.
 # These currently exist for a workaround in the settings controller and should be removed.
-class CommishClass(object):
+class CommishClass:
     pass
 
 
-class CommishPrice(object):
+class CommishPrice:
     pass
 
 
diff --git a/weasyl/pagination.py b/weasyl/pagination.py
index 2ef8cfa48..b4a8cc457 100644
--- a/weasyl/pagination.py
+++ b/weasyl/pagination.py
@@ -1,5 +1,5 @@
 
-class PaginatedResult(object):
+class PaginatedResult:
     # We expect select_list to have at least the following keyword arguments:
     # limit, back_id, next_id
     def __init__(self, select_list, select_count, id_field, url_format, *args, limit=None, count_limit=None, **kwargs):
diff --git a/weasyl/profile.py b/weasyl/profile.py
index f9c6dd4f0..7eb303fb7 100644
--- a/weasyl/profile.py
+++ b/weasyl/profile.py
@@ -26,7 +26,7 @@
 from weasyl.error import WeasylError
 
 
-class ExchangeType(object):
+class ExchangeType:
     __slots__ = ()
 
 
@@ -35,7 +35,7 @@ class ExchangeType(object):
 EXCHANGE_TYPE_COMMISSION = ExchangeType()
 
 
-class ExchangeSetting(object):
+class ExchangeSetting:
     __slots__ = ("code",)
 
     def __init__(self, code):
@@ -951,7 +951,7 @@ def do_manage(my_userid, userid, username=None, full_name=None, catchphrase=None
 
 
 # TODO(hyena): Make this class unnecessary and remove it when we fix up settings.
-class ProfileSettings(object):
+class ProfileSettings:
     """
     This class standardizes access to jsonb profile settings,
     to ensure consistent use of naming conventions
@@ -959,7 +959,7 @@ class ProfileSettings(object):
     exceptions if you try to access a setting that has
     not been properly defined!
     """
-    class Setting(object):
+    class Setting:
         def __init__(self, default, typecast):
             self.default = default
             self.typecast = typecast
diff --git a/weasyl/search.py b/weasyl/search.py
index 1cf349ce4..fe4460a96 100644
--- a/weasyl/search.py
+++ b/weasyl/search.py
@@ -32,7 +32,7 @@
 COUNT_LIMIT = 10000
 
 
-class Query(object):
+class Query:
     def __init__(self):
         self.possible_includes = set()
         self.required_includes = set()
diff --git a/weasyl/test/login/test_authenticate_bcrypt.py b/weasyl/test/login/test_authenticate_bcrypt.py
index 0e794fccb..124c8baab 100644
--- a/weasyl/test/login/test_authenticate_bcrypt.py
+++ b/weasyl/test/login/test_authenticate_bcrypt.py
@@ -109,21 +109,21 @@ def test_login_succeeds_for_valid_username_and_password():
 
 @pytest.mark.usefixtures('db')
 def test_unicode_password():
-    user_id = db_utils.create_user(password=u"passwordé", username=user_name)
-    result = login.authenticate_bcrypt(username=user_name, password=u"passwordé", request=None)
+    user_id = db_utils.create_user(password="passwordé", username=user_name)
+    result = login.authenticate_bcrypt(username=user_name, password="passwordé", request=None)
     assert result == (user_id, None)
-    result = login.authenticate_bcrypt(username=user_name, password=u"passworde", request=None)
+    result = login.authenticate_bcrypt(username=user_name, password="passworde", request=None)
     assert result == (0, 'invalid')
-    result = login.authenticate_bcrypt(username=user_name, password=u"password", request=None)
+    result = login.authenticate_bcrypt(username=user_name, password="password", request=None)
     assert result == (0, 'invalid')
 
 
 @pytest.mark.usefixtures('db')
 def test_unicode_attempts():
-    user_id = db_utils.create_user(password=u"password", username=user_name)
-    result = login.authenticate_bcrypt(username=user_name, password=u"passwordé", request=None)
+    user_id = db_utils.create_user(password="password", username=user_name)
+    result = login.authenticate_bcrypt(username=user_name, password="passwordé", request=None)
     assert result == (0, 'invalid')
-    result = login.authenticate_bcrypt(username=user_name, password=u"passwörd", request=None)
+    result = login.authenticate_bcrypt(username=user_name, password="passwörd", request=None)
     assert result == (0, 'invalid')
-    result = login.authenticate_bcrypt(username=user_name, password=u"password", request=None)
+    result = login.authenticate_bcrypt(username=user_name, password="password", request=None)
     assert result == (user_id, None)
diff --git a/weasyl/test/login/test_create.py b/weasyl/test/login/test_create.py
index 751254fdf..6fa75fe82 100644
--- a/weasyl/test/login/test_create.py
+++ b/weasyl/test/login/test_create.py
@@ -262,7 +262,7 @@ def test_verify_correct_information_creates_account():
         name=form.username)
 
 
-class TestAccountCreationBlacklist(object):
+class TestAccountCreationBlacklist:
     @pytest.mark.usefixtures('db')
     def test_create_fails_if_email_domain_is_blacklisted(self):
         """
diff --git a/weasyl/test/login/test_password_secure.py b/weasyl/test/login/test_password_secure.py
index 754eae5cf..ba30939b1 100644
--- a/weasyl/test/login/test_password_secure.py
+++ b/weasyl/test/login/test_password_secure.py
@@ -3,9 +3,9 @@
 
 def test_password_secure():
     # Too short
-    assert not login.password_secure(u"")
-    assert not login.password_secure(u"Abc123*")
-    assert not login.password_secure(u"Passw0rd")
+    assert not login.password_secure("")
+    assert not login.password_secure("Abc123*")
+    assert not login.password_secure("Passw0rd")
 
     # Acceptable
-    assert login.password_secure(u"abcdefghijkl")
+    assert login.password_secure("abcdefghijkl")
diff --git a/weasyl/test/test_comment.py b/weasyl/test/test_comment.py
index 70fe253aa..9e715dad4 100644
--- a/weasyl/test/test_comment.py
+++ b/weasyl/test/test_comment.py
@@ -12,7 +12,7 @@
 
 
 @pytest.mark.usefixtures('db')
-class TestRemoveComment(object):
+class TestRemoveComment:
     generation_parameters = [
         ("submit", db_utils.create_submission_comment, comment.remove,
          db_utils.create_submission),
diff --git a/weasyl/test/test_define.py b/weasyl/test/test_define.py
index 2199441c6..d114b8812 100644
--- a/weasyl/test/test_define.py
+++ b/weasyl/test/test_define.py
@@ -153,4 +153,4 @@ def test_viewing_own_profile(db):
 
 
 def test_sysname():
-    assert d.get_sysname(u"ź") == "z"
+    assert d.get_sysname("ź") == "z"
diff --git a/weasyl/test/test_search.py b/weasyl/test/test_search.py
index b2a759d0d..591e1bf20 100644
--- a/weasyl/test/test_search.py
+++ b/weasyl/test/test_search.py
@@ -25,18 +25,18 @@ def test_query_parsing():
 
 
 @pytest.mark.parametrize(['term', 'n_results'], [
-    (u'nothing', 0),
-    (u'more nothing', 0),
-    (u'walrus', 2),
-    (u'penguin', 3),
-    (u'walrus penguin', 1),
-    (u'walrus -penguin', 1),
-    (u'walrus -penguin #general #explicit', 1),
-    (u'walrus -penguin #general #mature', 0),
-    (u'-walrus +penguin', 2),
-    (u'|walrus |penguin', 4),
-    (u'+nothing |walrus |penguin', 0),
-    (u'-nothing', 4),
+    ('nothing', 0),
+    ('more nothing', 0),
+    ('walrus', 2),
+    ('penguin', 3),
+    ('walrus penguin', 1),
+    ('walrus -penguin', 1),
+    ('walrus -penguin #general #explicit', 1),
+    ('walrus -penguin #general #mature', 0),
+    ('-walrus +penguin', 2),
+    ('|walrus |penguin', 4),
+    ('+nothing |walrus |penguin', 0),
+    ('-nothing', 4),
 ])
 def test_submission_search(db, term, n_results):
     user = db_utils.create_user()
@@ -94,11 +94,11 @@ def check(term, n_results):
         assert len(results) == n_results
 
     if rating < block_rating:
-        check(u'walrus', 2)
-        check(u'penguin', 2)
+        check('walrus', 2)
+        check('penguin', 2)
     else:
-        check(u'walrus', 1)
-        check(u'penguin', 0)
+        check('walrus', 1)
+        check('penguin', 0)
 
 
 _page_limit = 6
@@ -109,7 +109,7 @@ def test_search_pagination(db):
     owner = db_utils.create_user()
     submissions = [db_utils.create_submission(owner, rating=ratings.GENERAL.code) for i in range(30)]
     tag = db_utils.create_tag('penguin')
-    search_query = search.Query.parse(u'penguin', 'submit')
+    search_query = search.Query.parse('penguin', 'submit')
 
     for submission in submissions:
         db_utils.create_submission_tag(tag, submission)
@@ -143,16 +143,16 @@ def test_search_pagination(db):
 
 
 @pytest.mark.parametrize(['term', 'n_results'], [
-    (u"shouldmatchnothing\\k", 0),
-    (u"nobodyatall", 0),
-    (u"JasonAG", 1),
-    (u"Jason", 1),
-    (u"rob", 1),
-    (u"twisted", 2),
-    (u"sam", 2),
-    (u"jason otherkin", 2),
-    (u"ryan wildlife calvin", 3),
-    (u"Marth", 1),
+    ("shouldmatchnothing\\k", 0),
+    ("nobodyatall", 0),
+    ("JasonAG", 1),
+    ("Jason", 1),
+    ("rob", 1),
+    ("twisted", 2),
+    ("sam", 2),
+    ("jason otherkin", 2),
+    ("ryan wildlife calvin", 3),
+    ("Marth", 1),
 ])
 def test_user_search(db, term, n_results):
     config = CharSettings({}, {}, {})
@@ -177,5 +177,5 @@ def test_user_search_ordering(db):
     db_utils.create_user("user_Ab", username="userab", config=config)
     db_utils.create_user("user_Bb", username="userbb", config=config)
 
-    results = search.select_users(u"user")
+    results = search.select_users("user")
     assert [user["title"] for user in results] == ["user_aa", "user_Ab", "user_ba", "user_Bb"]
diff --git a/weasyl/test/test_submission.py b/weasyl/test/test_submission.py
index 0be94fe26..acdd6df7e 100644
--- a/weasyl/test/test_submission.py
+++ b/weasyl/test/test_submission.py
@@ -212,7 +212,7 @@ def test_recently_popular(self):
         sub2 = db_utils.create_submission(owner, rating=ratings.GENERAL.code, unixtime=now - datetime.timedelta(days=4))
         sub3 = db_utils.create_submission(owner, rating=ratings.GENERAL.code, unixtime=now - datetime.timedelta(days=2))
         sub4 = db_utils.create_submission(owner, rating=ratings.GENERAL.code, unixtime=now)
-        tag = db_utils.create_tag(u'tag')
+        tag = db_utils.create_tag('tag')
 
         for s in [sub1, sub2, sub3, sub4]:
             db_utils.create_submission_tag(tag, s)
diff --git a/weasyl/test/test_two_factor_auth.py b/weasyl/test/test_two_factor_auth.py
index 589df4704..f2ac219e2 100644
--- a/weasyl/test/test_two_factor_auth.py
+++ b/weasyl/test/test_two_factor_auth.py
@@ -269,7 +269,7 @@ def test_verify():
     # TOTP token with space successfully verifies, as some authenticators show codes like
     #   "123 456"; verify strips all spaces. (Successful Verification)
     tfa_response = totp.now()
-    # Now split the code into a space separated string (e.g., u"123 456")
+    # Now split the code into a space separated string (e.g., "123 456")
     tfa_response = tfa_response[:3] + ' ' + tfa_response[3:]
     assert tfa.verify(user_id, tfa_response)
 
diff --git a/weasyl/test/web/test_characters.py b/weasyl/test/web/test_characters.py
index d0a999cd4..ed1fcf804 100644
--- a/weasyl/test/web/test_characters.py
+++ b/weasyl/test/web/test_characters.py
@@ -9,15 +9,15 @@
 
 
 _BASE_FORM = {
-    'title': u'Test name',
-    'age': u'64021610030',
-    'gender': u'🦊',
-    'height': u'Test height',
-    'weight': u'Test weight',
-    'species': u'Test species',
+    'title': 'Test name',
+    'age': '64021610030',
+    'gender': '🦊',
+    'height': 'Test height',
+    'weight': 'Test weight',
+    'species': 'Test species',
     'rating': '10',
-    'content': u'Description',
-    'tags': u'',
+    'content': 'Description',
+    'tags': '',
 }
 
 
@@ -60,13 +60,13 @@ def _character(app, db, character_user):
 @pytest.mark.usefixtures('db', 'character_user')
 def test_list_empty(app):
     resp = app.get('/characters/character_test')
-    assert list(resp.html.find(class_='user-characters').stripped_strings) == [u'Characters', u'There are no characters to display.']
+    assert list(resp.html.find(class_='user-characters').stripped_strings) == ['Characters', 'There are no characters to display.']
 
 
 @pytest.mark.usefixtures('db', 'character')
 def test_create_default_thumbnail(app, character):
     resp = app.get('/character/%d/test-name' % (character,))
-    assert resp.html.find(id='detail-bar-title').string == u'Test name'
+    assert resp.html.find(id='detail-bar-title').string == 'Test name'
     assert resp.html.find(id='char-stats').find('dt', string='Gender:').findNext('dd').string == '🦊'
 
     image_url = resp.html.find(id='detail-art').a['href']
@@ -80,11 +80,11 @@ def test_owner_edit_details(app, character_user, character):
     form = dict(
         _BASE_FORM,
         charid=str(character),
-        title=u'Edited name',
+        title='Edited name',
     )
 
     resp = app.post('/edit/character', form, headers={'Cookie': cookie}).follow()
-    assert resp.html.find(id='detail-bar-title').string == u'Edited name'
+    assert resp.html.find(id='detail-bar-title').string == 'Edited name'
 
 
 @pytest.mark.usefixtures('db', 'character_user', 'character')
diff --git a/weasyl/test/web/test_journals.py b/weasyl/test/web/test_journals.py
index 6860b6232..696611902 100644
--- a/weasyl/test/web/test_journals.py
+++ b/weasyl/test/web/test_journals.py
@@ -14,11 +14,11 @@ def _journal_user(db, cache):
 @pytest.fixture(name='journals')
 @pytest.mark.usefixtures('db', 'journal_user')
 def _journals(journal_user):
-    db_utils.create_journal(journal_user, title=u'Test journal', unixtime=arrow.get(1), content=u'A test journal')
-    db_utils.create_journal(journal_user, title=u'Public journal', unixtime=arrow.get(2), content=u'A public journal')
-    db_utils.create_journal(journal_user, title=u'Hidden journal', unixtime=arrow.get(3), content=u'A hidden journal', hidden=True)
-    db_utils.create_journal(journal_user, title=u'Restricted journal', rating=ratings.MATURE.code, unixtime=arrow.get(4), content=u'A journal with a non-General rating')
-    db_utils.create_journal(journal_user, title=u'Recent journal', unixtime=arrow.get(5), content=u'The most recent journal', friends_only=True)
+    db_utils.create_journal(journal_user, title='Test journal', unixtime=arrow.get(1), content='A test journal')
+    db_utils.create_journal(journal_user, title='Public journal', unixtime=arrow.get(2), content='A public journal')
+    db_utils.create_journal(journal_user, title='Hidden journal', unixtime=arrow.get(3), content='A hidden journal', hidden=True)
+    db_utils.create_journal(journal_user, title='Restricted journal', rating=ratings.MATURE.code, unixtime=arrow.get(4), content='A journal with a non-General rating')
+    db_utils.create_journal(journal_user, title='Recent journal', unixtime=arrow.get(5), content='The most recent journal', friends_only=True)
 
 
 @pytest.mark.usefixtures('db', 'journal_user')
@@ -30,7 +30,7 @@ def test_profile_empty(app):
 @pytest.mark.usefixtures('db', 'journal_user', 'journals')
 def test_profile_guest(app):
     resp = app.get('/~journal_test')
-    assert resp.html.find(id='user-journal').h4.string == u'Public journal'
+    assert resp.html.find(id='user-journal').h4.string == 'Public journal'
 
 
 @pytest.mark.usefixtures('db', 'cache', 'journal_user', 'journals')
@@ -39,7 +39,7 @@ def test_profile_user(app):
     cookie = db_utils.create_session(user)
 
     resp = app.get('/~journal_test', headers={'Cookie': cookie})
-    assert resp.html.find(id='user-journal').h4.string == u'Restricted journal'
+    assert resp.html.find(id='user-journal').h4.string == 'Restricted journal'
 
 
 @pytest.mark.usefixtures('db', 'cache', 'journal_user', 'journals')
@@ -49,14 +49,14 @@ def test_profile_friend(app, journal_user):
     db_utils.create_friendship(user, journal_user)
 
     resp = app.get('/~journal_test', headers={'Cookie': cookie})
-    assert resp.html.find(id='user-journal').h4.string == u'Recent journal'
+    assert resp.html.find(id='user-journal').h4.string == 'Recent journal'
 
 
 @pytest.mark.usefixtures('db', 'journal_user', 'journals')
 def test_list_guest(app):
     resp = app.get('/journals/journal_test')
     titles = [link.string for link in resp.html.find(id='journals-content').find_all('a')]
-    assert titles == [u'Public journal', u'Test journal']
+    assert titles == ['Public journal', 'Test journal']
 
 
 @pytest.mark.usefixtures('db', 'cache')
@@ -66,12 +66,12 @@ def test_list_unicode_username(app):
     characters, which aren’t supposed to exist but do because of
     a historical bug.
     """
-    journal_user = db_utils.create_user(username=u'journál_test')
-    db_utils.create_journal(journal_user, title=u'Unícode journal 😊', content=u'A journal and poster username with non-ASCII characters 😊')
+    journal_user = db_utils.create_user(username='journál_test')
+    db_utils.create_journal(journal_user, title='Unícode journal 😊', content='A journal and poster username with non-ASCII characters 😊')
 
     resp = app.get('/journals/journaltest')
     titles = [link.string for link in resp.html.find(id='journals-content').find_all('a')]
-    assert titles == [u'Unícode journal 😊']
+    assert titles == ['Unícode journal 😊']
 
 
 def create_journal(app, user, *, rating):
@@ -87,7 +87,7 @@ def test_create(app, journal_user):
     create_journal(app, journal_user, rating="10")
 
     resp = app.get('/~journal_test')
-    assert resp.html.find(id='user-journal').h4.string == u'Created journal'
+    assert resp.html.find(id='user-journal').h4.string == 'Created journal'
 
 
 @pytest.mark.usefixtures('db', 'journal_user')
@@ -97,7 +97,7 @@ def test_login_required_to_edit_journal(app, journal_user):
 
     resp = app.post(
         '/edit/journal',
-        {'title': u'Created journal', 'rating': '10', 'content': u'A journal', 'journalid': journalid},
+        {'title': 'Created journal', 'rating': '10', 'content': 'A journal', 'journalid': journalid},
         status=403,
     )
     assert "You must be signed in to perform this operation." in resp.html.find(id='error_content').text
diff --git a/weasyl/test/web/test_site_updates.py b/weasyl/test/web/test_site_updates.py
index 9318a56dc..8b8f398d1 100644
--- a/weasyl/test/web/test_site_updates.py
+++ b/weasyl/test/web/test_site_updates.py
@@ -7,8 +7,8 @@
 
 
 _FORM = {
-    u'title': u'Title',
-    u'content': u'Content',
+    'title': 'Title',
+    'content': 'Content',
 }
 
 
@@ -71,7 +71,7 @@ def test_index(app, site_updates):
 @pytest.mark.usefixtures('db')
 def test_list_empty(app):
     resp = app.get('/site-updates/')
-    assert resp.html.find(None, 'text-post-list').p.string == u'No site updates to show.'
+    assert resp.html.find(None, 'text-post-list').p.string == 'No site updates to show.'
 
 
 @pytest.mark.usefixtures('db')
@@ -110,7 +110,7 @@ def test_create_strip(app, monkeypatch):
         dict(_FORM, title=' test title \t '),
         headers={'Cookie': cookie},
     ).follow()
-    assert resp.html.find(id='home-content').h3.string == u'test title'
+    assert resp.html.find(id='home-content').h3.string == 'test title'
 
 
 @pytest.mark.usefixtures('db')
@@ -148,10 +148,10 @@ def test_create_validation(app, monkeypatch):
     cookie = db_utils.create_session(user)
     monkeypatch.setattr(staff, 'ADMINS', frozenset([user]))
 
-    resp = app.post('/admincontrol/siteupdate', {'title': u'', 'content': u'Content'}, headers={'Cookie': cookie}, status=422)
+    resp = app.post('/admincontrol/siteupdate', {'title': '', 'content': 'Content'}, headers={'Cookie': cookie}, status=422)
     assert resp.html.find(id='error_content').p.text.strip() == errorcode.error_messages['titleInvalid']
 
-    resp = app.post('/admincontrol/siteupdate', {'title': u'Title', 'content': u''}, headers={'Cookie': cookie}, status=422)
+    resp = app.post('/admincontrol/siteupdate', {'title': 'Title', 'content': ''}, headers={'Cookie': cookie}, status=422)
     assert resp.html.find(id='error_content').p.text.strip() == errorcode.error_messages['contentInvalid']
 
 
@@ -196,7 +196,7 @@ def test_edit_strip(app, monkeypatch, site_updates):
         dict(_FORM, title=' test title \t '),
         headers={'Cookie': cookie},
     ).follow()
-    assert resp.html.find(id='home-content').h3.string == u'test title'
+    assert resp.html.find(id='home-content').h3.string == 'test title'
 
 
 @pytest.mark.usefixtures('db')
@@ -249,10 +249,10 @@ def test_edit_validation(app, monkeypatch, site_updates):
     cookie = db_utils.create_session(user)
     monkeypatch.setattr(staff, 'ADMINS', frozenset([user]))
 
-    resp = app.post('/site-updates/%d' % (updates[-1]['updateid'],), {'title': u'', 'content': u'Content'}, headers={'Cookie': cookie}, status=422)
+    resp = app.post('/site-updates/%d' % (updates[-1]['updateid'],), {'title': '', 'content': 'Content'}, headers={'Cookie': cookie}, status=422)
     assert resp.html.find(id='error_content').p.text.strip() == errorcode.error_messages['titleInvalid']
 
-    resp = app.post('/site-updates/%d' % (updates[-1]['updateid'],), {'title': u'Title', 'content': u''}, headers={'Cookie': cookie}, status=422)
+    resp = app.post('/site-updates/%d' % (updates[-1]['updateid'],), {'title': 'Title', 'content': ''}, headers={'Cookie': cookie}, status=422)
     assert resp.html.find(id='error_content').p.text.strip() == errorcode.error_messages['contentInvalid']
 
 
@@ -273,11 +273,11 @@ def test_edit_notifications(app, monkeypatch):
 
     resp = app.post(
         '/site-updates/%d' % (siteupdate.select_last()['updateid'],),
-        dict(_FORM, title=u'New title'),
+        dict(_FORM, title='New title'),
         headers={'Cookie': admin_cookie},
     ).follow()
-    assert resp.html.find(id='home-content').h3.string == u'New title'
+    assert resp.html.find(id='home-content').h3.string == 'New title'
 
     resp = app.get('/messages/notifications', headers={'Cookie': normal_cookie})
     assert list(resp.html.find(id='header-messages').find(title='Notifications').stripped_strings)[1] == '1'
-    assert resp.html.find(id='site_updates').find(None, 'item').a.string == u'New title'
+    assert resp.html.find(id='site_updates').find(None, 'item').a.string == 'New title'
diff --git a/weasyl/test/web/test_submissions.py b/weasyl/test/web/test_submissions.py
index 1231415c8..924898f43 100644
--- a/weasyl/test/web/test_submissions.py
+++ b/weasyl/test/web/test_submissions.py
@@ -44,17 +44,17 @@ def _post_expecting(form, expected_rating):
 
     form = dict(
         BASE_VISUAL_FORM,
-        rating=u'30',
+        rating='30',
         submitfile=webtest.Upload('wesley1.png', read_asset('img/wesley1.png'), 'image/png'),
     )
     _post_expecting(form, 'Mature' if age >= 18 else None)
 
     form['submitfile'] = webtest.Upload('wesley-jumpingtext.png', read_asset('img/help/wesley-jumpingtext.png'), 'image/png')
-    form['rating'] = u'40'
+    form['rating'] = '40'
     _post_expecting(form, 'Explicit' if age >= 18 else None)
 
     form['submitfile'] = webtest.Upload('wesley-draw.png', read_asset('img/help/wesley-draw.png'), 'image/png')
-    form['rating'] = u'10'
+    form['rating'] = '10'
     _post_expecting(form, 'General')
 
 
@@ -91,7 +91,7 @@ def test_visual_reupload_thumbnail_and_cover(app, submission_user):
 
     # Reupload submission 1 with image 2
     app.post('/reupload/submission', {
-        'targetid': u'%i' % (v1,),
+        'targetid': '%i' % (v1,),
         'submitfile': wesley2_large,
     }, headers={'Cookie': cookie}).follow()
 
@@ -101,7 +101,7 @@ def test_visual_reupload_thumbnail_and_cover(app, submission_user):
 
     # Remove submission 1, so uploading a duplicate image is allowed
     app.post('/remove/submission', {
-        'submitid': u'%i' % (v1,),
+        'submitid': '%i' % (v1,),
     }, headers={'Cookie': cookie}).follow(headers={'Cookie': cookie})
 
     # Upload submission 2 with image 2