Merge remote-tracking branch 'upstream/main' into downloads/latest/prerelease

Author: hugovk

downloads/admin.py

@@ -25,3 +25,9 @@ class ReleaseAdmin(ContentManageableModelAdmin):
     list_filter = ['version', 'is_published', 'show_on_download_page']
     search_fields = ['name', 'slug']
     ordering = ['-release_date']
+
+    def formfield_for_dbfield(self, db_field, request, **kwargs):
+        field = super().formfield_for_dbfield(db_field, request, **kwargs)
+        if db_field.name == "name":
+            field.widget.attrs["placeholder"] = "Python 3.X.YaN"
+        return field

downloads/urls.py

@@ -5,7 +5,7 @@
 urlpatterns = [
     re_path(r'latest/python2/?$', views.DownloadLatestPython2.as_view(), name='download_latest_python2'),
     re_path(r'latest/python3/?$', views.DownloadLatestPython3.as_view(), name='download_latest_python3'),
-    re_path(r'latest/python3\.(?P<minor>\d+)/?$', views.DownloadLatestPython3x.as_view(), name='download_latest_python3x'),
+    re_path(r'latest/python3\.(?P<minor>\d+)/?$', views.DownloadLatestPython3.as_view(), name='download_latest_python3x'),
     re_path(r'latest/prerelease/?$', views.DownloadLatestPrerelease.as_view(), name='download_latest_prerelease'),
     re_path(r'latest/pymanager/?$', views.DownloadLatestPyManager.as_view(), name='download_latest_pymanager'),
     re_path(r'latest/?$', views.DownloadLatestPython3.as_view(), name='download_latest_python3'),

downloads/views.py

@@ -30,40 +30,21 @@ def get_redirect_url(self, **kwargs):
 
 
 class DownloadLatestPython3(RedirectView):
-    """ Redirect to latest Python 3 release """
-    permanent = False
-
-    def get_redirect_url(self, **kwargs):
-        try:
-            latest_python3 = Release.objects.latest_python3()
-        except Release.DoesNotExist:
-            latest_python3 = None
+    """Redirect to latest Python 3 release, optionally for a specific minor"""
 
-        if latest_python3:
-            return latest_python3.get_absolute_url()
-        else:
-            return reverse('download')
-
-
-class DownloadLatestPython3x(RedirectView):
-    """ Redirect to latest Python 3.x release for a specific minor version """
     permanent = False
 
     def get_redirect_url(self, **kwargs):
         minor_version = kwargs.get('minor')
-        if not minor_version:
-            return reverse('downloads:download')
-
         try:
-            minor_version_int = int(minor_version)
+            minor_version_int = int(minor_version) if minor_version else None
             latest_release = Release.objects.latest_python3(minor_version_int)
         except (ValueError, Release.DoesNotExist):
             latest_release = None
 
         if latest_release:
             return latest_release.get_absolute_url()
-        else:
-            return reverse('downloads:download')
+        return reverse("downloads:download")
 
 
 class DownloadLatestPrerelease(RedirectView):