Jul 2, 2022 · Jun 24, 2022 · Jun 24, 2022 · Jun 24, 2022 · Jun 24, 2022 · Jun 24, 2022
diff --git a/Lib/base64.py b/Lib/base64.py
    usage = """usage: %s [-h|-d|-e|-u|-t] [file|-]
        -h: print this help message and exit
        -d, -u: decode
        -e: encode (default)
        -t: encode and decode string 'Aladdin:open sesame'"""%sys.argv[0]
        -e: encode (default)"""%sys.argv[0]
    try:
        opts, args = getopt.getopt(sys.argv[1:], 'hdeut')
    except getopt.error as msg:
        if o == '-e': func = encode
        if o == '-d': func = decode
        if o == '-u': func = decode
        if o == '-t': test(); return
        if o == '-h': print(usage); return
    if args and args[0] != '-':
        with open(args[0], 'rb') as f:
        func(sys.stdin.buffer, sys.stdout.buffer)


 def test():
    s0 = b"Aladdin:open sesame"
    print(repr(s0))
    s1 = encodebytes(s0)
    print(repr(s1))
    s2 = decodebytes(s1)
    print(repr(s2))
    assert s0 == s2


 if __name__ == '__main__':
    main()
diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
    def get_output(self, *args):
        return script_helper.assert_python_ok('-m', 'base64', *args).out

    def test_encode_decode(self):
        output = self.get_output('-t')
        self.assertSequenceEqual(output.splitlines(), (
            b"b'Aladdin:open sesame'",
            br"b'QWxhZGRpbjpvcGVuIHNlc2FtZQ==\n'",
            b"b'Aladdin:open sesame'",
        ))

    def test_encode_file(self):
        with open(os_helper.TESTFN, 'wb') as fp:
            fp.write(b'a\xffb\n')
diff --git a/Misc/NEWS.d/next/Library/2022-06-24-19-16-09.gh-issue-93096.r1_oIc.rst b/Misc/NEWS.d/next/Library/2022-06-24-19-16-09.gh-issue-93096.r1_oIc.rst
 Removed undocumented ``-t`` argument of ``python -m base64``. Use
 ``python -m unittest test.test_base64.LegacyBase64TestCase.test_encodebytes``
 instead.
Original file line number	Diff line number	Diff line change
Expand Up		@@ -570,8 +570,7 @@ def main():
		usage = """usage: %s [-h\|-d\|-e\|-u\|-t] [file\|-]
Copy link Member corona10Jul 2, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. nit: Can we update`usage` to use f-string? Copy link MemberAuthor arhadthedevJul 2, 2022 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Done. Should I go further and convert it to argparse?
		-h: print this help message and exit
		-d, -u: decode
		-e: encode (default)
		-t: encode and decode string 'Aladdin:open sesame'"""%sys.argv[0]
		-e: encode (default)"""%sys.argv[0]
		try:
		opts, args = getopt.getopt(sys.argv[1:], 'hdeut')
		except getopt.error as msg:
Expand All		@@ -584,7 +583,6 @@ def main():
		if o == '-e': func = encode
		if o == '-d': func = decode
		if o == '-u': func = decode
		if o == '-t': test(); return
		if o == '-h': print(usage); return
		if args and args[0] != '-':
		with open(args[0], 'rb') as f:
Expand All		@@ -593,15 +591,5 @@ def main():
		func(sys.stdin.buffer, sys.stdout.buffer)


		def test():
		s0 = b"Aladdin:open sesame"
		print(repr(s0))
		s1 = encodebytes(s0)
		print(repr(s1))
		s2 = decodebytes(s1)
		print(repr(s2))
		assert s0 == s2


		if __name__ == '__main__':
		main()
Original file line number	Diff line number	Diff line change
Expand Up		@@ -762,14 +762,6 @@ def tearDown(self):
		def get_output(self, *args):
		return script_helper.assert_python_ok('-m', 'base64', *args).out

		def test_encode_decode(self):
arhadthedev marked this conversation as resolved. Show resolvedHide resolved
		output = self.get_output('-t')
		self.assertSequenceEqual(output.splitlines(), (
		b"b'Aladdin:open sesame'",
		br"b'QWxhZGRpbjpvcGVuIHNlc2FtZQ==\n'",
		b"b'Aladdin:open sesame'",
		))

		def test_encode_file(self):
		with open(os_helper.TESTFN, 'wb') as fp:
		fp.write(b'a\xffb\n')
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		Removed undocumented ``-t`` argument of ``python -m base64``. Use
		``python -m unittest test.test_base64.LegacyBase64TestCase.test_encodebytes``
		instead.