diff options
author | Oleg Iarygin <oleg@arhadthedev.net> | 2022-07-02 06:53:43 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-02 06:53:43 (GMT) |
commit | 7db1d2eaf367a1073191c80c7baeee41ae1f2f21 (patch) | |
tree | c3c355671158f78f116604c7942bcb324cf65aa7 /Lib | |
parent | cc81962e6975f9b45901efd05a2d156a7864b527 (diff) | |
download | cpython-7db1d2eaf367a1073191c80c7baeee41ae1f2f21.zip cpython-7db1d2eaf367a1073191c80c7baeee41ae1f2f21.tar.gz cpython-7db1d2eaf367a1073191c80c7baeee41ae1f2f21.tar.bz2 |
gh-93096: Remove `python -m base64 -t` (gh-94230)
Diffstat (limited to 'Lib')
-rwxr-xr-x | Lib/base64.py | 16 | ||||
-rw-r--r-- | Lib/test/test_base64.py | 12 |
2 files changed, 6 insertions, 22 deletions
diff --git a/Lib/base64.py b/Lib/base64.py index 7e9c2a2..30796a6 100755 --- a/Lib/base64.py +++ b/Lib/base64.py @@ -567,11 +567,10 @@ def decodebytes(s): def main(): """Small main program""" import sys, getopt - usage = """usage: %s [-h|-d|-e|-u|-t] [file|-] + usage = f"""usage: {sys.argv[0]} [-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)""" try: opts, args = getopt.getopt(sys.argv[1:], 'hdeut') except getopt.error as msg: @@ -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: @@ -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() diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py index 217f294..fa03fa1 100644 --- a/Lib/test/test_base64.py +++ b/Lib/test/test_base64.py @@ -31,6 +31,8 @@ class LegacyBase64TestCase(unittest.TestCase): b"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE" b"RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0\nNT" b"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==\n") + eq(base64.encodebytes(b"Aladdin:open sesame"), + b"QWxhZGRpbjpvcGVuIHNlc2FtZQ==\n") # Non-bytes eq(base64.encodebytes(bytearray(b'abc')), b'YWJj\n') eq(base64.encodebytes(memoryview(b'abc')), b'YWJj\n') @@ -50,6 +52,8 @@ class LegacyBase64TestCase(unittest.TestCase): b"ABCDEFGHIJKLMNOPQRSTUVWXYZ" b"0123456789!@#0^&*();:<>,. []{}") eq(base64.decodebytes(b''), b'') + eq(base64.decodebytes(b"QWxhZGRpbjpvcGVuIHNlc2FtZQ==\n"), + b"Aladdin:open sesame") # Non-bytes eq(base64.decodebytes(bytearray(b'YWJj\n')), b'abc') eq(base64.decodebytes(memoryview(b'YWJj\n')), b'abc') @@ -762,14 +766,6 @@ class TestMain(unittest.TestCase): 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') |