Commit7db1d2e

authored

gh-93096: Removepython -m base64 -t (gh-94230)

1 parentcc81962 commit7db1d2eCopy full SHA for 7db1d2e

File tree

-22

lines changed

-22

lines changed

Lines changed: 2 additions & 14 deletions

Original file line number	Diff line number	Diff line change
`@@ -567,11 +567,10 @@ def decodebytes(s):`
`567`	`567`	`defmain():`
`568`	`568`	`"""Small main program"""`
`569`	`569`	`importsys,getopt`
`570`		`-usage="""usage:%s [-h\|-d\|-e\|-u\|-t] [file\|-]`
	`570`	`+usage=f"""usage:{sys.argv[0]} [-h\|-d\|-e\|-u\|-t] [file\|-]`
`571`	`571`	`-h: print this help message and exit`
`572`	`572`	`-d, -u: decode`
`573`		`- -e: encode (default)`
`574`		`- -t: encode and decode string 'Aladdin:open sesame'"""%sys.argv[0]`
	`573`	`+ -e: encode (default)"""`
`575`	`574`	`try:`
`576`	`575`	`opts,args=getopt.getopt(sys.argv[1:],'hdeut')`
`577`	`576`	`exceptgetopt.errorasmsg:`
`@@ -584,7 +583,6 @@ def main():`
`584`	`583`	`ifo=='-e':func=encode`
`585`	`584`	`ifo=='-d':func=decode`
`586`	`585`	`ifo=='-u':func=decode`
`587`		`-ifo=='-t':test();return`
`588`	`586`	`ifo=='-h':print(usage);return`
`589`	`587`	`ifargsandargs[0]!='-':`
`590`	`588`	`withopen(args[0],'rb')asf:`
`@@ -593,15 +591,5 @@ def main():`
`593`	`591`	`func(sys.stdin.buffer,sys.stdout.buffer)`
`594`	`592`
`595`	`593`
`596`		`-deftest():`
`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`		`-asserts0==s2`
`604`		`-`
`605`		`-`
`606`	`594`	`if__name__=='__main__':`
`607`	`595`	`main()`

Lines changed: 4 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ def test_encodebytes(self):`
`31`	`31`	`b"YWJjZGVmZ2hpamtsbW5vcHFyc3R1dnd4eXpBQkNE"`
`32`	`32`	`b"RUZHSElKS0xNTk9QUVJTVFVWV1hZWjAxMjM0\nNT"`
`33`	`33`	`b"Y3ODkhQCMwXiYqKCk7Ojw+LC4gW117fQ==\n")`
	`34`	`+eq(base64.encodebytes(b"Aladdin:open sesame"),`
	`35`	`+b"QWxhZGRpbjpvcGVuIHNlc2FtZQ==\n")`
`34`	`36`	`# Non-bytes`
`35`	`37`	`eq(base64.encodebytes(bytearray(b'abc')),b'YWJj\n')`
`36`	`38`	`eq(base64.encodebytes(memoryview(b'abc')),b'YWJj\n')`
`@@ -50,6 +52,8 @@ def test_decodebytes(self):`
`50`	`52`	`b"ABCDEFGHIJKLMNOPQRSTUVWXYZ"`
`51`	`53`	`b"0123456789!@#0^&*();:<>,. []{}")`
`52`	`54`	`eq(base64.decodebytes(b''),b'')`
	`55`	`+eq(base64.decodebytes(b"QWxhZGRpbjpvcGVuIHNlc2FtZQ==\n"),`
	`56`	`+b"Aladdin:open sesame")`
`53`	`57`	`# Non-bytes`
`54`	`58`	`eq(base64.decodebytes(bytearray(b'YWJj\n')),b'abc')`
`55`	`59`	`eq(base64.decodebytes(memoryview(b'YWJj\n')),b'abc')`
`@@ -762,14 +766,6 @@ def tearDown(self):`
`762`	`766`	`defget_output(self,*args):`
`763`	`767`	`returnscript_helper.assert_python_ok('-m','base64',*args).out`
`764`	`768`
`765`		`-deftest_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`		`-`
`773`	`769`	`deftest_encode_file(self):`
`774`	`770`	`withopen(os_helper.TESTFN,'wb')asfp:`
`775`	`771`	`fp.write(b'a\xffb\n')`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff 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.`

Comments

(0)