Apply `pyupgrade --py3-plus` to remove Python 2 compatibility code.

3 files changed, 48 insertions, 48 deletions

diff --git a/mediagoblin/plugins/archivalook/models.py b/mediagoblin/plugins/archivalook/models.py
index 3d8dd756..a7f72642 100644
--- a/mediagoblin/plugins/archivalook/models.py
+++ b/mediagoblin/plugins/archivalook/models.py
@@ -64,17 +64,17 @@ class FeaturedMedia(Base):
         self.save()
 
     def demote(self):
-        if self.is_last_of_type() and self.display_type == u'primary':
-            self.display_type = u'secondary'
-        elif self.is_last_of_type() and self.display_type == u'secondary':
-            self.display_type = u'tertiary'
+        if self.is_last_of_type() and self.display_type == 'primary':
+            self.display_type = 'secondary'
+        elif self.is_last_of_type() and self.display_type == 'secondary':
+            self.display_type = 'tertiary'
         self.save()
 
     def promote(self):
-        if self.is_first_of_type() and self.display_type == u'secondary':
-            self.display_type = u'primary'
-        elif self.is_first_of_type() and self.display_type == u'tertiary':
-            self.display_type = u'secondary'
+        if self.is_first_of_type() and self.display_type == 'secondary':
+            self.display_type = 'primary'
+        elif self.is_first_of_type() and self.display_type == 'tertiary':
+            self.display_type = 'secondary'
         self.save()
 
     def is_first_of_type(self):
diff --git a/mediagoblin/plugins/archivalook/tools.py b/mediagoblin/plugins/archivalook/tools.py
index ad2eee5f..47eec7dc 100644
--- a/mediagoblin/plugins/archivalook/tools.py
+++ b/mediagoblin/plugins/archivalook/tools.py
@@ -56,7 +56,7 @@ def parse_url(url):
                                         who uploaded the piece of media, slug is
                                         the media entry's url slug.
     """
-    url = six.text_type(url)
+    url = str(url)
     u_end, m_start, m_end, end = (url.find('/u/') + 3,
                                   url.find('/m/'),
                                   url.find('/m/') + 3,
@@ -87,14 +87,14 @@ def split_featured_media_list(featured_media):
                                                 or tertiary)
     """
 
-    featured_media = six.text_type(featured_media)
+    featured_media = str(featured_media)
     featured_media_list = featured_media.split("\n")
     display_type = 0
     media_already_featured = []
     all_featured_media = []
     for line in featured_media_list:
         if line == '' or line.isspace(): continue
-        elif line.startswith(u'-'):
+        elif line.startswith('-'):
             display_type += 1
         elif display_type <= 0 or display_type > 3: continue
         else:
@@ -106,9 +106,9 @@ def split_featured_media_list(featured_media):
             media_already_featured.append(media)
             all_featured_media.append((media,
                 [None,
-                u'primary',
-                u'secondary',
-                u'tertiary'][display_type]))
+                'primary',
+                'secondary',
+                'tertiary'][display_type]))
 
     return all_featured_media
 
@@ -123,24 +123,24 @@ def create_featured_media_textbox():
 
     primaries = FeaturedMedia.query.order_by(
         FeaturedMedia.order.asc()).filter(
-        FeaturedMedia.display_type == u'primary').all()
+        FeaturedMedia.display_type == 'primary').all()
     secondaries = FeaturedMedia.query.order_by(
         FeaturedMedia.order.asc()).filter(
-        FeaturedMedia.display_type == u'secondary').all()
+        FeaturedMedia.display_type == 'secondary').all()
     tertiaries = FeaturedMedia.query.order_by(
         FeaturedMedia.order.asc()).filter(
-        FeaturedMedia.display_type == u'tertiary').all()
-    output_text = u''
+        FeaturedMedia.display_type == 'tertiary').all()
+    output_text = ''
     for display_type, feature_list in [
-            (_(u'Primary'),primaries),
-            (_(u'Secondary'),secondaries),
-            (_(u'Tertiary'),tertiaries)]:
+            (_('Primary'),primaries),
+            (_('Secondary'),secondaries),
+            (_('Tertiary'),tertiaries)]:
         output_text += _(
-            u"""-----------{display_type}-Features---------------------------
+            """-----------{display_type}-Features---------------------------
 """).format(display_type=display_type)
         for feature in feature_list:
             media_entry = feature.media_entry
-            output_text += u'/u/{uploader_username}/m/{media_slug}/\n'.format(
+            output_text += '/u/{uploader_username}/m/{media_slug}/\n'.format(
                 uploader_username = media_entry.get_actor.username,
                 media_slug = media_entry.slug)
 
@@ -164,9 +164,9 @@ def automatically_add_new_feature(media_entry):
     # secondary features, but in the future this should be a variable editable
     # by the site admin.
     too_many_primaries = FeaturedMedia.query.filter(
-        FeaturedMedia.display_type==u'primary').count() >= 1
+        FeaturedMedia.display_type=='primary').count() >= 1
     too_many_secondaries = FeaturedMedia.query.filter(
-        FeaturedMedia.display_type==u'secondary').count() >= 2
+        FeaturedMedia.display_type=='secondary').count() >= 2
     featured_first_to_last = FeaturedMedia.query.order_by(
         FeaturedMedia.order.asc()).all()
 
@@ -174,11 +174,11 @@ def automatically_add_new_feature(media_entry):
         # Some features have the option to demote or promote themselves to a
         # different display_type, based on their position. But all features move
         # up and down one step in the stack.
-        if (feature.is_last_of_type() and feature.display_type == u'primary'
+        if (feature.is_last_of_type() and feature.display_type == 'primary'
                 and too_many_primaries):
             feature.demote()
             too_many_primaries = False
-        elif (feature.is_last_of_type() and feature.display_type == u'secondary'
+        elif (feature.is_last_of_type() and feature.display_type == 'secondary'
                 and too_many_secondaries):
             feature.demote()
             too_many_secondaries = False
@@ -188,7 +188,7 @@ def automatically_add_new_feature(media_entry):
     # Create the new feature at the top of the stack.
     new_feature = FeaturedMedia(
         media_entry=media_entry,
-        display_type=u"primary",
+        display_type="primary",
         order=0)
     new_feature.save()
     return new_feature
@@ -252,10 +252,10 @@ def promote_feature(media_entry):
                                         target_feature.display_type)
         above_feature.save()
     # Change the feature's display type to a more prominent one
-    elif target_feature.display_type == u'secondary':
-        target_feature.display_type = u'primary'
-    elif target_feature.display_type == u'tertiary':
-        target_feature.display_type = u'secondary'
+    elif target_feature.display_type == 'secondary':
+        target_feature.display_type = 'primary'
+    elif target_feature.display_type == 'tertiary':
+        target_feature.display_type = 'secondary'
     target_feature.save()
 
 def demote_feature(media_entry):
@@ -287,8 +287,8 @@ def demote_feature(media_entry):
                                         target_feature.display_type)
         below_feature.save()
     # Change the feature's display type to a less prominent one
-    elif target_feature.display_type == u'secondary':
-        target_feature.display_type = u'tertiary'
-    elif target_feature.display_type == u'primary':
-        target_feature.display_type = u'secondary'
+    elif target_feature.display_type == 'secondary':
+        target_feature.display_type = 'tertiary'
+    elif target_feature.display_type == 'primary':
+        target_feature.display_type = 'secondary'
     target_feature.save()
diff --git a/mediagoblin/plugins/archivalook/views.py b/mediagoblin/plugins/archivalook/views.py
index 72424cfc..ca832a5c 100644
--- a/mediagoblin/plugins/archivalook/views.py
+++ b/mediagoblin/plugins/archivalook/views.py
@@ -40,15 +40,15 @@ def root_view(request):
     displaying featured media.
     """
     featured_media = {
-        u'primary':FeaturedMedia.query.order_by(
+        'primary':FeaturedMedia.query.order_by(
             FeaturedMedia.order.asc()).filter(
-            FeaturedMedia.display_type==u'primary').all(),
-        u'secondary':FeaturedMedia.query.order_by(
+            FeaturedMedia.display_type=='primary').all(),
+        'secondary':FeaturedMedia.query.order_by(
             FeaturedMedia.order.asc()).filter(
-            FeaturedMedia.display_type==u'secondary').all(),
-        u'tertiary':FeaturedMedia.query.order_by(
+            FeaturedMedia.display_type=='secondary').all(),
+        'tertiary':FeaturedMedia.query.order_by(
             FeaturedMedia.order.asc()).filter(
-            FeaturedMedia.display_type==u'tertiary').all()}
+            FeaturedMedia.display_type=='tertiary').all()}
 
     return render_to_response(
         request, 'archivalook/root.html',
@@ -56,7 +56,7 @@ def root_view(request):
         'allow_registration': mg_globals.app_config["allow_registration"],
         'feature_template': feature_template})
 
-@user_has_privilege(u'featurer')
+@user_has_privilege('featurer')
 def featured_media_panel(request):
     """
     This is a new administrator panel to manage featured media. This is an
@@ -99,7 +99,7 @@ def recent_media_gallery_view(request, page):
     """
     The replaced homepage is available through this view.
     """
-    cursor = MediaEntry.query.filter_by(state=u'processed').\
+    cursor = MediaEntry.query.filter_by(state='processed').\
         order_by(MediaEntry.created.desc())
 
     pagination = Pagination(page, cursor)
@@ -117,7 +117,7 @@ def add_featured_media_to_media_home(context):
     context['featured_media'] = FeaturedMedia.query
     return context
 
-@user_has_privilege(u'featurer')
+@user_has_privilege('featurer')
 @get_user_media_entry
 def feature_media(request, media, **kwargs):
     """
@@ -130,7 +130,7 @@ def feature_media(request, media, **kwargs):
     return redirect(
         request, 'index')
 
-@user_has_privilege(u'featurer')
+@user_has_privilege('featurer')
 @get_user_media_entry
 def unfeature_media(request, media, **kwargs):
     """
@@ -143,7 +143,7 @@ def unfeature_media(request, media, **kwargs):
     return redirect(
         request, 'index')
 
-@user_has_privilege(u'featurer')
+@user_has_privilege('featurer')
 @get_user_media_entry
 def promote_featured_media(request, media, **kwargs):
     """
@@ -156,7 +156,7 @@ def promote_featured_media(request, media, **kwargs):
     return redirect(
         request, 'index')
 
-@user_has_privilege(u'featurer')
+@user_has_privilege('featurer')
 @get_user_media_entry
 def demote_featured_media(request, media, **kwargs):
     """