Remove min_api_level field

mhsmith · mhsmith · commit 646441bb531d · 2024-03-25T18:27:31.000Z
diff --git a/Doc/library/platform.rst b/Doc/library/platform.rst
@@ -306,7 +306,7 @@ Linux Platforms
 Android Platform
 ----------------
 
-.. function:: android_ver(release="", api_level=0, min_api_level=0, \
+.. function:: android_ver(release="", api_level=0, \
                           manufacturer="", model="", device="")
 
    Get Android device information. Returns a :func:`~collections.namedtuple`
@@ -317,9 +317,6 @@ Android Platform
 
    * ``api_level`` - API level, as an integer (e.g. ``34``)
 
-   * ``min_api_level`` - Minimum API level this build of Python can run on, as
-     an integer (e.g. ``21``)
-
    * ``manufacturer`` - `manufacturer name
      <https://developer.android.com/reference/android/os/Build#MANUFACTURER>`__
 
diff --git a/Lib/platform.py b/Lib/platform.py
@@ -544,13 +544,10 @@ def java_ver(release='', vendor='', vminfo=('', '', ''), osinfo=('', '', '')):
 
 
 AndroidVer = collections.namedtuple(
-    "AndroidVer",
-    "release api_level min_api_level manufacturer model device")
+    "AndroidVer", "release api_level manufacturer model device")
 
-def android_ver(release="", api_level=0, min_api_level=0,
-                manufacturer="", model="", device=""):
+def android_ver(release="", api_level=0, manufacturer="", model="", device=""):
     if sys.platform == "android":
-        min_api_level = sys.getandroidapilevel()
         try:
             from ctypes import CDLL, c_char_p, create_string_buffer
         except ImportError:
@@ -577,8 +574,7 @@ def getprop(name, default):
             model = getprop("ro.product.model", model)
             device = getprop("ro.product.device", device)
 
-    return AndroidVer(
-        release, api_level, min_api_level, manufacturer, model, device)
+    return AndroidVer(release, api_level, manufacturer, model, device)
 
 
 ### System name aliasing
diff --git a/Lib/test/test_platform.py b/Lib/test/test_platform.py
@@ -446,7 +446,7 @@ def test_libc_ver(self):
     def test_android_ver(self):
         res = platform.android_ver()
         self.assertIsInstance(res, tuple)
-        self.assertEqual(res, (res.release, res.api_level, res.min_api_level,
+        self.assertEqual(res, (res.release, res.api_level,
                                res.manufacturer, res.model, res.device))
 
         if sys.platform == "android":
@@ -456,29 +456,21 @@ def test_android_ver(self):
                     self.assertIsInstance(value, str)
                     self.assertGreater(len(value), 0)
 
-            for name in ["api_level", "min_api_level"]:
-                with self.subTest(name):
-                    value = getattr(res, name)
-                    self.assertIsInstance(value, int)
-                    self.assertGreater(value, 0)
-
-            self.assertEqual(res.min_api_level, sys.getandroidapilevel())
-            self.assertGreaterEqual(res.api_level, res.min_api_level)
+            self.assertIsInstance(res.api_level, int)
+            self.assertGreaterEqual(res.api_level, sys.getandroidapilevel())
 
         # When not running on Android, it should return the default values.
         else:
             self.assertEqual(res.release, "")
             self.assertEqual(res.api_level, 0)
-            self.assertEqual(res.min_api_level, 0)
             self.assertEqual(res.manufacturer, "")
             self.assertEqual(res.model, "")
             self.assertEqual(res.device, "")
 
             # Default values may also be overridden using parameters.
-            res = platform.android_ver("alpha", 1, 2, "bravo", "charlie", "delta")
+            res = platform.android_ver("alpha", 1, "bravo", "charlie", "delta")
             self.assertEqual(res.release, "alpha")
             self.assertEqual(res.api_level, 1)
-            self.assertEqual(res.min_api_level, 2)
             self.assertEqual(res.manufacturer, "bravo")
             self.assertEqual(res.model, "charlie")
             self.assertEqual(res.device, "delta")
