aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/plugins/archivalook/tools.py
diff options
context:
space:
mode:
authorBen Sturmfels <ben@sturm.com.au>2021-03-05 23:12:19 +1100
committerBen Sturmfels <ben@sturm.com.au>2021-03-05 23:12:19 +1100
commitdec47c7102cf0aa3a4debf002928db8e460c0d71 (patch)
tree47631fc15c7af172aa699506adf3d76d3a71976c /mediagoblin/plugins/archivalook/tools.py
parent5f3a782fef4855e10b7259624a14d8afb0f7be93 (diff)
downloadmediagoblin-dec47c7102cf0aa3a4debf002928db8e460c0d71.tar.lz
mediagoblin-dec47c7102cf0aa3a4debf002928db8e460c0d71.tar.xz
mediagoblin-dec47c7102cf0aa3a4debf002928db8e460c0d71.zip
Apply `pyupgrade --py3-plus` to remove Python 2 compatibility code.
Diffstat (limited to 'mediagoblin/plugins/archivalook/tools.py')
-rw-r--r--mediagoblin/plugins/archivalook/tools.py56
1 files changed, 28 insertions, 28 deletions
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()