Fixes #1658 Version gating does not handle 3.10 and later (#1766)

zooba · web-flow · commit fc9cc47f3d70 · 2021-08-25T14:02:40.000-04:00
* Fixes #1658 Version gating does not handle 3.10 and later * Replace function with properties * Remove unused code * Copy paste fail
diff --git a/downloads/models.py b/downloads/models.py
@@ -124,6 +124,27 @@ def get_version(self):
             return version.group(1)
         return None
 
+    def is_version_at_least(self, min_version_tuple):
+        v1 = []
+        for b in self.get_version().split('.'):
+            try:
+                v1.append(int(b))
+            except ValueError:
+                break
+        # If v1 (us) is shorter than v2 (the comparand), it will always fail.
+        # Add zeros for the comparison.
+        while len(min_version_tuple) > len(v1):
+            v1.append(0)
+        return tuple(v1) >= min_version_tuple
+
+    @property
+    def is_version_at_least_3_5(self):
+        return self.is_version_at_least((3, 5))
+
+    @property
+    def is_version_at_least_3_9(self):
+        return self.is_version_at_least((3, 9))
+
 
 def update_supernav():
     latest_python3 = Release.objects.latest_python3()
diff --git a/downloads/tests/test_models.py b/downloads/tests/test_models.py
@@ -75,3 +75,15 @@ def test_get_version_invalid(self):
                 release = Release.objects.create(name=name)
                 self.assertEqual(release.name, name)
                 self.assertIsNone(release.get_version())
+
+    def test_is_version_at_least(self):
+        self.assertFalse(self.release_275.is_version_at_least_3_5)
+        self.assertFalse(self.release_275.is_version_at_least_3_9)
+
+        release_38 = Release.objects.create(name='Python 3.8.0')
+        self.assertFalse(release_38.is_version_at_least_3_9)
+        self.assert_(release_38.is_version_at_least_3_5)
+
+        release_310 = Release.objects.create(name='Python 3.10.0')
+        self.assert_(release_310.is_version_at_least_3_9)
+        self.assert_(release_310.is_version_at_least_3_5)
diff --git a/templates/downloads/os_list.html b/templates/downloads/os_list.html
@@ -39,9 +39,9 @@ <h2>Stable Releases</h2>
                     <li>
                         <a href="{{ r.get_absolute_url }}">{{ r.name }} - {{ r.release_date|date }}</a>
                         {% if os.slug == 'windows' %}
-                            {% if r.name >= 'Python 3.9' %}
+                            {% if r.is_version_at_least_3_9 %}
                             <p><strong>Note that {{ r.name }} <em>cannot</em> be used on Windows 7 or earlier.</strong></p>
-                            {% elif r.name >= 'Python 3.5' %}
+                            {% elif r.is_version_at_least_3_5 %}
                             <p><strong>Note that {{ r.name }} <em>cannot</em> be used on Windows XP or earlier.</strong></p>
                             {% endif %}
                         {% endif %}
