summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorR. David Murray <rdmurray@bitdance.com>2010-12-14 14:34:16 (GMT)
committerR. David Murray <rdmurray@bitdance.com>2010-12-14 14:34:16 (GMT)
commitdacb8043ff1fb6fa33b5457f0405a1ca867ba2d3 (patch)
tree7027bc35f5ca1789f16719625bf1b7f4008c9a0a /Lib
parent79af245fb24a3608c341410ab9c782ce930401fe (diff)
downloadcpython-dacb8043ff1fb6fa33b5457f0405a1ca867ba2d3.zip
cpython-dacb8043ff1fb6fa33b5457f0405a1ca867ba2d3.tar.gz
cpython-dacb8043ff1fb6fa33b5457f0405a1ca867ba2d3.tar.bz2
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. ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/telnetlib.py2
1 files changed, 1 insertions, 1 deletions
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 @@ class Telnet:
"""
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: