aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/listings/views.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/listings/views.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/listings/views.py')
-rw-r--r--mediagoblin/listings/views.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/mediagoblin/listings/views.py b/mediagoblin/listings/views.py
index 4dd93543..11d480d3 100644
--- a/mediagoblin/listings/views.py
+++ b/mediagoblin/listings/views.py
@@ -45,7 +45,7 @@ def _get_tag_name_from_entries(media_entries, tag_slug):
@uses_pagination
def tag_listing(request, page):
"""'Gallery'/listing for this tag slug"""
- tag_slug = request.matchdict[u'tag']
+ tag_slug = request.matchdict['tag']
cursor = media_entries_for_tag_slug(request.db, tag_slug)
cursor = cursor.order_by(MediaEntry.created.desc())
@@ -71,7 +71,7 @@ def atom_feed(request):
"""
generates the atom feed with the tag images
"""
- tag_slug = request.matchdict.get(u'tag')
+ tag_slug = request.matchdict.get('tag')
feed_title = "MediaGoblin Feed"
if tag_slug:
feed_title += " for tag '%s'" % tag_slug
@@ -81,7 +81,7 @@ def atom_feed(request):
else: # all recent item feed
feed_title += " for all recent items"
link = request.urlgen('index', qualified=True)
- cursor = MediaEntry.query.filter_by(state=u'processed')
+ cursor = MediaEntry.query.filter_by(state='processed')
cursor = cursor.order_by(MediaEntry.created.desc())
cursor = cursor.limit(ATOM_DEFAULT_NR_OF_UPDATED_ITEMS)
@@ -110,7 +110,7 @@ def atom_feed(request):
# Include a thumbnail image in content.
file_urls = get_media_file_paths(entry.media_files, request.urlgen)
if 'thumb' in file_urls:
- content = u'<img src="{thumb}" alt='' /> {desc}'.format(
+ content = '<img src="{thumb}" alt='' /> {desc}'.format(
thumb=file_urls['thumb'], desc=entry.description_html)
else:
content = entry.description_html