8000 Remove min_api_level field · python/cpython@646441b · GitHub
[go: up one dir, main page]
Skip to content

Commit 646441b

Browse files
mhsmithmhsmith
committed
Remove min_api_level field
1 parent 4108dfc commit 646441b

File tree

3 files changed

+8
-23
lines changed

3 files changed

+8
-23
lines changed

‎Doc/library/platform.rst

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ Linux Platforms
306306
Android Platform
307307
----------------
308308

309-
.. function:: android_ver(release="", api_level=0, min_api_level=0, \
309+
.. function:: android_ver(release="", api_level=0, \
310310
manufacturer="", model="", device="")
311311

312312
Get Android device information. Returns a :func:`~collections.namedtuple`
@@ -317,9 +317,6 @@ Android Platform
317317

318318
* ``api_level`` - API level, as an integer (e.g. ``34``)
319319

320-
* ``min_api_level`` - Minimum API level this build of Python can run on, as
321-
an integer (e.g. ``21``)
322-
323320
* ``manufacturer`` - `manufacturer name
324321
<https://developer.android.com/reference/android/os/Build#MANUFACTURER>`__
325322

‎Lib/platform.py

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -544,13 +544,10 @@ def java_ver(release='', vendor='', vminfo=('', '', ''), osinfo=('', '', '')):
544544

545545

546546
AndroidVer = collections.namedtuple(
547-
"AndroidVer",
548-
"release api_level min_api_level manufacturer model device")
547+
"AndroidVer", "release api_level manufacturer model device")
549548

550-
def android_ver(release="", api_level=0, min_api_level=0,
551-
manufacturer="", model="", device=""):
549+
def android_ver(release="", api_level=0, manufacturer="", model="", device=""):
552550
if sys.platform == "android":
553-
min_api_level = sys.getandroidapilevel()
554551
try:
555552
from ctypes import CDLL, c_char_p, create_string_buffer
556553
except ImportError:
@@ -577,8 +574,7 @@ def getprop(name, default):
577574
model = getprop("ro.product.model", model)
578575
device = getprop("ro.product.device", device)
579576

580-
return AndroidVer(
581-
release, api_level, min_api_level, manufacturer, model, device)
577+
return AndroidVer(release, api_level, manufacturer, model, device)
582578

583579

584580
### System name aliasing

‎Lib/test/test_platform.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ def test_libc_ver(self):
446446
def test_android_ver(self):
447447
res = platform.android_ver()
448448
self.assertIsInstance(res, tuple)
449-
self.assertEqual(res, (res.release, res.api_level, res.min_api_level,
449+
self.assertEqual(res, (res.release, res.api_level,
450450
res.manufacturer, res.model, res.device))
451451

452452
if sys.platform == "android":
@@ -456,29 +456,21 @@ def test_android_ver(self):
456456
self.assertIsInstance(value, str)
457457
self.assertGreater(len(value), 0)
458458

459-
for name in ["api_level", "min_api_level"]:
460-
with self.subTest(name):
461-
value = getattr(res, name)
462-
self.assertIsInstance(value, int)
463-
self.assertGreater(value, 0)
464-
465-
self.assertEqual(res.min_api_level, sys.getandroidapilevel())
466-
self.assertGreaterEqual(res.api_level, res.min_api_level)
459+
self.assertIsInstance(res.api_level, int)
460+
self.assertGreaterEqual(res.api_level, sys.getandroidapilevel())
467461

468462
# When not running on Android, it should return the default values.
469463
else:
470464
self.assertEqual(res.release, "")
471465
self.assertEqual(res.api_level, 0)
472-
self.assertEqual(res.min_api_level, 0)
473466
self.assertEqual(res.manufacturer, "")
474467
self.assertEqual(res.model, "")
475468
self.assertEqual(res.device, "")
476469

477470
# Default values may also be overridden using parame 681E ters.
478-
res = platform.android_ver("alpha", 1, 2, "bravo", "charlie", "delta")
471+
res = platform.android_ver("alpha", 1, "bravo", "charlie", "delta")
479472
self.assertEqual(res.release, "alpha")
480473
self.assertEqual(res.api_level, 1)
481-
self.assertEqual(res.min_api_level, 2)
482474
self.assertEqual(res.manufacturer, "bravo")
483475
self.assertEqual(res.model, "charlie")
484476
self.assertEqual(res.device, "delta")

0 commit comments

Comments
 (0)
0