Merge branch 'upstream'

main/templatetags/cdn.py

@@ -9,24 +9,24 @@ register = template.Library()
 @register.simple_tag
 def jquery():
     version = '3.6.0'
-    filename = 'jquery-%s.min.js' % version
+    filename = f'jquery-{version}.min.js'
     link = staticfiles_storage.url(filename)
-    return mark_safe('<script type="text/javascript" src="%s"></script>' % link)
+    return mark_safe(f'<script type="text/javascript" src="{link}"></script>')
 
 
 @register.simple_tag
 def jquery_tablesorter():
     version = '2.31.0'
-    filename = 'jquery.tablesorter-%s.min.js' % version
+    filename = f'jquery.tablesorter-{version}.min.js'
     link = staticfiles_storage.url(filename)
-    return format_html('<script type="text/javascript" src="%s"></script>' % link)
+    return format_html('<script type="text/javascript" src="{link}"></script>', link=link)
 
 
 @register.simple_tag
 def d3js():
     version = '3.5.0'
-    filename = 'd3-%s.min.js' % version
+    filename = f'd3-{version}.min.js'
     link = staticfiles_storage.url(filename)
-    return format_html('<script type="text/javascript" src="%s"></script>' % link)
+    return format_html('<script type="text/javascript" src="{link}"></script>', link=link)
 
 # vim: set ts=4 sw=4 et:

main/templatetags/flags.py

@@ -8,8 +8,11 @@ register = template.Library()
 def country_flag(country):
     if not country:
         return ''
-    return format_html('<span class="fam-flag fam-flag-%s" title="%s"></span> ' % (
-        str(country.code).lower(), str(country.name)))
+    return format_html(
+        '<span class="fam-flag fam-flag-{country_code}" title="{country_name}"></span> ',
+        country_code=str(country.code).lower(),
+        country_name=str(country.name),
+    )
 
 
 # vim: set ts=4 sw=4 et:

main/templatetags/pgp.py

@@ -56,8 +56,10 @@ def pgp_key_link(key_id, link_text=None):
                                                                                             key_id)
     if link_text is None:
         link_text = '0x%s' % key_id[-8:]
-    values = (url, format_key(key_id), link_text)
-    return format_html('<a href="%s" title="PGP key search for %s">%s</a>' % values)
+    return format_html('<a href="{url}" title="PGP key search for {key}">{content}</a>',
+                       url=url,
+                       key=format_key(key_id),
+                       content=link_text)
 
 
 @register.simple_tag

packages/templatetags/package_extras.py

@@ -43,8 +43,8 @@ def pkg_details_link(pkg, link_title=None, honor_flagged=False):
     link_content = link_title
     if honor_flagged and pkg.flag_date:
         link_content = '<span class="flagged">%s</span>' % link_title
-    link = '<a href="%s" title="View package details for %s">%s</a>'
-    return format_html(link % (pkg.get_absolute_url(), pkg.pkgname, link_content))
+    link = '<a href="{link}" title="View package details for {pkgname}">{content}</a>'
+    return format_html(link, link=pkg.get_absolute_url(), pkgname=pkg.pkgname, content=link_content)
 
 
 # vim: set ts=4 sw=4 et:

settings.py

@@ -273,4 +273,10 @@ if PROMETHEUS_METRICS:
 
     INSTALLED_APPS = [*list(INSTALLED_APPS), 'django_prometheus']
 
+# Assume all URLField will be HTTPS if not specified.
+# NOTE: this can be removed once we bump Django to 6.x
+# where `https` becomes the default.
+FORMS_URLFIELD_ASSUME_HTTPS = True
+
+
 # vim: set ts=4 sw=4 et:

templates/public/donate.html

@@ -53,16 +53,6 @@
     <img src="{% static "nitrokey_logo.png" %}"
     class="sponsor-btn-nitrokey" title="" alt="Nitrokey logo"/></a>
 
-    <p>We would also like to thank <a href="https://www.shells.com/"
-    title="Shells">Shells.com</a> for their monetary donation.
-    Shells provides you with a 1-click, powerful virtual desktop environment,
-    driven by a cloud computer, without leaving your browser! It's your
-    personal workspace in the cloud.</p>
-
-    <a href="https://www.shells.com/" title="Shells">
-    <img src="{% static "shells_logo.png" %}"
-    title="" alt="Shells logo"/></a>
-
     <h3>Past donors</h3>
 
     <p><a href="http://www.dotcom-monitor.com/" title="Dotcom-Monitor">Dotcom-Monitor</a> &amp; <a href="https://www.loadview-testing.com/" title="LoadView">LoadView</a></p>

templates/public/index.html

@@ -205,11 +205,6 @@
         <img src="{% static "icons8_logo.png" %}"
             title="" alt="Icons8 logo"/>
     </a>
-
-    <a href="https://www.shells.com" title="Shells.com">
-        <img src="{% static "shells_logo.png" %}"
-            title="" alt="Shells logo"/>
-    </a>
 </div>
 {% endcache %}
 {% endblock %}

todolists/templatetags/todolists.py

@@ -13,8 +13,9 @@ def todopkg_details_link(todopkg):
     pkg = todopkg.pkg
     if not pkg:
         return todopkg.pkgname
-    link = '<a href="%s" title="View package details for %s">%s</a>'
+    link = '<a href={url}s" title="View package details for {pkgname}">{pkgname}</a>'
     url = pkg_absolute_url(todopkg.repo, todopkg.arch, pkg.pkgname)
-    return format_html(link % (url, pkg.pkgname, pkg.pkgname))
+    return format_html(link, url=url, pkgname=pkg.pkgname)
+
 
 # vim: set ts=4 sw=4 et: