bpo-15999: Clean up of handling boolean arguments. (GH-15610)
* Use the 'p' format unit instead of manually called PyObject_IsTrue().
* Pass boolean value instead 0/1 integers to functions that needs boolean.
* Convert some arguments to boolean only once.
diff --git a/Lib/test/datetimetester.py b/Lib/test/datetimetester.py
index d09255d..d5de5e9 100644
--- a/Lib/test/datetimetester.py
+++ b/Lib/test/datetimetester.py
@@ -6160,7 +6160,7 @@
def test_date_from_date(self):
exp_date = date(1993, 8, 26)
- for macro in [0, 1]:
+ for macro in False, True:
with self.subTest(macro=macro):
c_api_date = _testcapi.get_date_fromdate(
macro,
@@ -6173,7 +6173,7 @@
def test_datetime_from_dateandtime(self):
exp_date = datetime(1993, 8, 26, 22, 12, 55, 99999)
- for macro in [0, 1]:
+ for macro in False, True:
with self.subTest(macro=macro):
c_api_date = _testcapi.get_datetime_fromdateandtime(
macro,
@@ -6191,7 +6191,7 @@
exp_date = datetime(1993, 8, 26, 22, 12, 55, 99999)
for fold in [0, 1]:
- for macro in [0, 1]:
+ for macro in False, True:
with self.subTest(macro=macro, fold=fold):
c_api_date = _testcapi.get_datetime_fromdateandtimeandfold(
macro,
@@ -6210,7 +6210,7 @@
def test_time_from_time(self):
exp_time = time(22, 12, 55, 99999)
- for macro in [0, 1]:
+ for macro in False, True:
with self.subTest(macro=macro):
c_api_time = _testcapi.get_time_fromtime(
macro,
@@ -6225,7 +6225,7 @@
exp_time = time(22, 12, 55, 99999)
for fold in [0, 1]:
- for macro in [0, 1]:
+ for macro in False, True:
with self.subTest(macro=macro, fold=fold):
c_api_time = _testcapi.get_time_fromtimeandfold(
macro,
@@ -6241,7 +6241,7 @@
def test_delta_from_dsu(self):
exp_delta = timedelta(26, 55, 99999)
- for macro in [0, 1]:
+ for macro in False, True:
with self.subTest(macro=macro):
c_api_delta = _testcapi.get_delta_fromdsu(
macro,
@@ -6254,7 +6254,7 @@
def test_date_from_timestamp(self):
ts = datetime(1995, 4, 12).timestamp()
- for macro in [0, 1]:
+ for macro in False, True:
with self.subTest(macro=macro):
d = _testcapi.get_date_fromtimestamp(int(ts), macro)
@@ -6272,7 +6272,7 @@
from_timestamp = _testcapi.get_datetime_fromtimestamp
for case in cases:
- for macro in [0, 1]:
+ for macro in False, True:
with self.subTest(case=case, macro=macro):
dtup, tzinfo, usetz = case
dt_orig = datetime(*dtup, tzinfo=tzinfo)
diff --git a/Lib/test/lock_tests.py b/Lib/test/lock_tests.py
index d12a86e..cd1155d 100644
--- a/Lib/test/lock_tests.py
+++ b/Lib/test/lock_tests.py
@@ -182,7 +182,7 @@
def test_timeout(self):
lock = self.locktype()
# Can't set timeout if not blocking
- self.assertRaises(ValueError, lock.acquire, 0, 1)
+ self.assertRaises(ValueError, lock.acquire, False, 1)
# Invalid timeout values
self.assertRaises(ValueError, lock.acquire, timeout=-100)
self.assertRaises(OverflowError, lock.acquire, timeout=1e100)
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
index 1100c49..db2f6cd 100644
--- a/Lib/test/test_builtin.py
+++ b/Lib/test/test_builtin.py
@@ -320,8 +320,8 @@
bom = b'\xef\xbb\xbf'
compile(bom + b'print(1)\n', '', 'exec')
compile(source='pass', filename='?', mode='exec')
- compile(dont_inherit=0, filename='tmp', source='0', mode='eval')
- compile('pass', '?', dont_inherit=1, mode='exec')
+ compile(dont_inherit=False, filename='tmp', source='0', mode='eval')
+ compile('pass', '?', dont_inherit=True, mode='exec')
compile(memoryview(b"text"), "name", "exec")
self.assertRaises(TypeError, compile)
self.assertRaises(ValueError, compile, 'print(42)\n', '<string>', 'badmode')
@@ -1853,7 +1853,7 @@
self.assertEqual(data, sorted(copy, key=lambda x: -x))
self.assertNotEqual(data, copy)
random.shuffle(copy)
- self.assertEqual(data, sorted(copy, reverse=1))
+ self.assertEqual(data, sorted(copy, reverse=True))
self.assertNotEqual(data, copy)
def test_bad_arguments(self):
diff --git a/Lib/test/test_ioctl.py b/Lib/test/test_ioctl.py
index d1a5db9..a287358 100644
--- a/Lib/test/test_ioctl.py
+++ b/Lib/test/test_ioctl.py
@@ -48,7 +48,7 @@
else:
buf.append(fill)
with open("/dev/tty", "rb") as tty:
- r = fcntl.ioctl(tty, termios.TIOCGPGRP, buf, 1)
+ r = fcntl.ioctl(tty, termios.TIOCGPGRP, buf, True)
rpgrp = buf[0]
self.assertEqual(r, 0)
self.assertIn(rpgrp, ids)
diff --git a/Lib/test/test_ordered_dict.py b/Lib/test/test_ordered_dict.py
index 148a9bd..f337be8 100644
--- a/Lib/test/test_ordered_dict.py
+++ b/Lib/test/test_ordered_dict.py
@@ -407,9 +407,9 @@
self.assertEqual(list(od), list('abcde'))
od.move_to_end('c')
self.assertEqual(list(od), list('abdec'))
- od.move_to_end('c', 0)
+ od.move_to_end('c', False)
self.assertEqual(list(od), list('cabde'))
- od.move_to_end('c', 0)
+ od.move_to_end('c', False)
self.assertEqual(list(od), list('cabde'))
od.move_to_end('e')
self.assertEqual(list(od), list('cabde'))
@@ -418,7 +418,7 @@
with self.assertRaises(KeyError):
od.move_to_end('x')
with self.assertRaises(KeyError):
- od.move_to_end('x', 0)
+ od.move_to_end('x', False)
def test_move_to_end_issue25406(self):
OrderedDict = self.OrderedDict
diff --git a/Lib/test/test_unicode.py b/Lib/test/test_unicode.py
index 7bd7f51..8636f2b 100644
--- a/Lib/test/test_unicode.py
+++ b/Lib/test/test_unicode.py
@@ -2820,15 +2820,15 @@
for s in ['abc', '\xa1\xa2', '\u4f60\u597d', 'a\U0001f600',
'a\ud800b\udfffc', '\ud834\udd1e']:
l = len(s)
- self.assertEqual(unicode_asucs4(s, l, 1), s+'\0')
- self.assertEqual(unicode_asucs4(s, l, 0), s+'\uffff')
- self.assertEqual(unicode_asucs4(s, l+1, 1), s+'\0\uffff')
- self.assertEqual(unicode_asucs4(s, l+1, 0), s+'\0\uffff')
- self.assertRaises(SystemError, unicode_asucs4, s, l-1, 1)
- self.assertRaises(SystemError, unicode_asucs4, s, l-2, 0)
+ self.assertEqual(unicode_asucs4(s, l, True), s+'\0')
+ self.assertEqual(unicode_asucs4(s, l, False), s+'\uffff')
+ self.assertEqual(unicode_asucs4(s, l+1, True), s+'\0\uffff')
+ self.assertEqual(unicode_asucs4(s, l+1, False), s+'\0\uffff')
+ self.assertRaises(SystemError, unicode_asucs4, s, l-1, True)
+ self.assertRaises(SystemError, unicode_asucs4, s, l-2, False)
s = '\0'.join([s, s])
- self.assertEqual(unicode_asucs4(s, len(s), 1), s+'\0')
- self.assertEqual(unicode_asucs4(s, len(s), 0), s+'\uffff')
+ self.assertEqual(unicode_asucs4(s, len(s), True), s+'\0')
+ self.assertEqual(unicode_asucs4(s, len(s), False), s+'\uffff')
# Test PyUnicode_AsUTF8()
@support.cpython_only