diff options
| -rw-r--r-- | Lib/telnetlib.py | 2 | ||||
| -rw-r--r-- | Lib/test/test_telnetlib.py | 10 | ||||
| -rw-r--r-- | Misc/NEWS | 3 |
3 files changed, 14 insertions, 1 deletions
diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py index c60578d..82b5e8f 100644 --- a/Lib/telnetlib.py +++ b/Lib/telnetlib.py @@ -236,7 +236,7 @@ class Telnet: """ if self.debuglevel > 0: - print('Telnet(%s,%d):' % (self.host, self.port), end=' ') + print('Telnet(%s,%s):' % (self.host, self.port), end=' ') if args: print(msg % args) else: diff --git a/Lib/test/test_telnetlib.py b/Lib/test/test_telnetlib.py index 3f5976b..c1eea06 100644 --- a/Lib/test/test_telnetlib.py +++ b/Lib/test/test_telnetlib.py @@ -342,6 +342,16 @@ class OptionTests(TestCase): expected = "send b'xxx'\n" self.assertTrue(expected in telnet._messages) + def test_debug_accepts_str_port(self): + # Issue 10695 + with test_socket([]): + telnet = TelnetAlike('dummy', '0') + telnet._messages = '' + telnet.set_debuglevel(1) + telnet.msg('test') + self.assertRegexpMatches(telnet._messages, r'0.*test') + + def test_main(verbose=None): support.run_unittest(GeneralTests, ReadTests, WriteTests, OptionTests) @@ -17,6 +17,9 @@ Core and Builtins Library ------- +- Issue #10695: passing the port as a string value to telnetlib no longer + causes debug mode to fail. + - Issue #1078919: add_header now automatically RFC2231 encodes parameters that contain non-ascii values. |