Skip to content

Commit d045ccb

Browse files
committed
remove encodebytes (and test)
and remove if-statement for whether _name is in globals() in base64.py
1 parent 40a4a4c commit d045ccb

2 files changed

Lines changed: 2 additions & 8 deletions

File tree

Lib/base64.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -380,9 +380,8 @@ def encode_wrapper(*args, **kwargs):
380380
return encode_wrapper
381381

382382

383-
for _name in ["b64encode", "b32encode", "b16encode", "encodebytes"]:
384-
if _name in __all__:
385-
globals()[_name] = _warn_encode(globals()[_name], _name)
383+
for _name in ["b64encode", "b32encode", "b16encode"]:
384+
globals()[_name] = _warn_encode(globals()[_name], _name)
386385

387386
if __name__ == '__main__':
388387
test()

Lib/test/test_py3kwarn.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -401,11 +401,6 @@ def test_b16encode_warns(self):
401401
base64.b16encode(b'test')
402402
check_py3k_warnings(expected, UserWarning)
403403

404-
def test_encodebytes_warns(self):
405-
expected = "base64.encodebytes returns str in Python 2 (bytes in 3.x)"
406-
base64.encodebytes(b'test')
407-
check_py3k_warnings(expected, UserWarning)
408-
409404

410405
class TestStdlibRemovals(unittest.TestCase):
411406

0 commit comments

Comments
 (0)