Skip to content

Commit 5816daa

Browse files
committed
Fix CI
1 parent 307f93a commit 5816daa

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

‎Lib/poplib.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ def _build_client(args, ssl_context=None):
531531

532532

533533
def _run_main(pop3, args):
534-
print(pop3.getwelcome()) # this line prints bytes, but kept for compat
534+
print(pop3.getwelcome().decode(pop3.encoding))
535535
pop3.user(args.user)
536536
pop3.pass_(args.password)
537537
pop3.list()

‎Lib/test/test_poplib.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ def test_regular_usage(self):
633633
poplib._run_main(client, args)
634634

635635
output_text = output.getvalue()
636-
self.assertTrue(output_text.startswith("b'+OK"))
636+
self.assertTrue(output_text.startswith('+OK'))
637637
self.assertEqual(output_text.count('From: postmaster@python.org'), 10)
638638
self.assertEqual(output_text.count('Subject: Dummy'), 10)
639639

@@ -650,7 +650,7 @@ def test_verbose_usage(self):
650650
poplib._run_main(client, args)
651651

652652
output_text = output.getvalue()
653-
self.assertTrue(output_text.startswith("b'+OK"))
653+
self.assertTrue(output_text.startswith('+OK'))
654654
self.assertEqual(output_text.count('From: postmaster@python.org'), 20)
655655
self.assertEqual(output_text.count('Subject: Dummy'), 20)
656656
self.assertIn('*stat*', output_text)
@@ -670,7 +670,7 @@ def test_regular_tls(self):
670670
poplib._run_main(client, args)
671671

672672
output_text = output.getvalue()
673-
self.assertTrue(output_text.startswith("b'+OK"))
673+
self.assertTrue(output_text.startswith('+OK'))
674674
self.assertEqual(output_text.count('From: postmaster@python.org'), 10)
675675
self.assertEqual(output_text.count('Subject: Dummy'), 10)
676676

@@ -733,7 +733,7 @@ def test_regular_ssl(self):
733733
poplib._run_main(client, args)
734734

735735
output_text = output.getvalue()
736-
self.assertTrue(output_text.startswith("b'+OK"))
736+
self.assertTrue(output_text.startswith('+OK'))
737737
self.assertEqual(output_text.count('From: postmaster@python.org'), 10)
738738
self.assertEqual(output_text.count('Subject: Dummy'), 10)
739739

0 commit comments

Comments
 (0)