Merged revisions 87230 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r87230 | r.david.murray | 2010-12-14 09:16:20 -0500 (Tue, 14 Dec 2010) | 7 lines
#10695: use %s not %d so that a string 'port' does not cause a debug traceback
Passing the port as a string value works fine in regular mode, but
if you turned debug on it would throw an error trying to print the
port number, which is surprising and confusing.
........
diff --git a/Lib/telnetlib.py b/Lib/telnetlib.py
index 2bfd9cd..bae4ae7 100644
--- a/Lib/telnetlib.py
+++ b/Lib/telnetlib.py
@@ -236,7 +236,7 @@
"""
if self.debuglevel > 0:
- print 'Telnet(%s,%d):' % (self.host, self.port),
+ print 'Telnet(%s,%s):' % (self.host, self.port),
if args:
print msg % args
else: