Skip to content

Commit 7db1d2e

Browse files
authored
gh-93096: Remove python -m base64 -t (gh-94230)
1 parent cc81962 commit 7db1d2e

File tree

3 files changed

+9
-22
lines changed

3 files changed

+9
-22
lines changed

Lib/base64.py

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -567,11 +567,10 @@ def decodebytes(s):
567567
def main():
568568
"""Small main program"""
569569
import sys, getopt
570-
usage = """usage: %s [-h|-d|-e|-u|-t] [file|-]
570+
usage = f"""usage: {sys.argv[0]} [-h|-d|-e|-u|-t] [file|-]
571571
-h: print this help message and exit
572572
-d, -u: decode
573-
-e: encode (default)
574-
-t: encode and decode string 'Aladdin:open sesame'"""%sys.argv[0]
573+
-e: encode (default)"""
575574
try:
576575
opts, args = getopt.getopt(sys.argv[1:], 'hdeut')
577576
except getopt.error as msg:
@@ -584,7 +583,6 @@ def main():
584583
if o == '-e': func = encode
585584
if o == '-d': func = decode
586585
if o == '-u': func = decode
587-
if o == '-t': test(); return
588586
if o == '-h': print(usage); return
589587
if args and args[0] != '-':
590588
with open(args[0], 'rb') as f:
@@ -593,15 +591,5 @@ def main():
593591
func(sys.stdin.buffer, sys.stdout.buffer)
594592

595593

596-
def test():
597-
s0 = b"Aladdin:open sesame"
598-
print(repr(s0))
599-
s1 = encodebytes(s0)
600-
print(repr(s1))
601-
s2 = decodebytes(s1)
602-
print(repr(s2))
603-
assert s0 == s2
604-
605-
606594
if __name__ == '__main__':
607595
main()

Lib/test/test_base64.py

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ def test_encodebytes(self):
3131
b"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"
3232
b"RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0\nNT"
3333
b"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==\n")
34+
eq(base64.encodebytes(b"Aladdin:open sesame"),
35+
b"QWxhZGRpbjpvcGVuIHNlc2FtZQ==\n")
3436
# Non-bytes
3537
eq(base64.encodebytes(bytearray(b'abc')), b'YWJj\n')
3638
eq(base64.encodebytes(memoryview(b'abc')), b'YWJj\n')
@@ -50,6 +52,8 @@ def test_decodebytes(self):
5052
b"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
5153
b"0123456789!@#0^&*();:<>,. []{}")
5254
eq(base64.decodebytes(b''), b'')
55+
eq(base64.decodebytes(b"QWxhZGRpbjpvcGVuIHNlc2FtZQ==\n"),
56+
b"Aladdin:open sesame")
5357
# Non-bytes
5458
eq(base64.decodebytes(bytearray(b'YWJj\n')), b'abc')
5559
eq(base64.decodebytes(memoryview(b'YWJj\n')), b'abc')
@@ -762,14 +766,6 @@ def tearDown(self):
762766
def get_output(self, *args):
763767
return script_helper.assert_python_ok('-m', 'base64', *args).out
764768

765-
def test_encode_decode(self):
766-
output = self.get_output('-t')
767-
self.assertSequenceEqual(output.splitlines(), (
768-
b"b'Aladdin:open sesame'",
769-
br"b'QWxhZGRpbjpvcGVuIHNlc2FtZQ==\n'",
770-
b"b'Aladdin:open sesame'",
771-
))
772-
773769
def test_encode_file(self):
774770
with open(os_helper.TESTFN, 'wb') as fp:
775771
fp.write(b'a\xffb\n')
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Removed undocumented ``-t`` argument of ``python -m base64``. Use
2+
``python -m unittest test.test_base64.LegacyBase64TestCase.test_encodebytes``
3+
instead.

0 commit comments

Comments
 (0)