From: R. David Murray <rdmurray@bitdance.com>
Date: Tue, 14 Dec 2010 14:34:16 +0000 (+0000)
Subject: Merged revisions 87230 via svnmerge from
X-Git-Tag: v2.7.2rc1~484
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dacb8043ff1fb6fa33b5457f0405a1ca867ba2d3;p=thirdparty%2FPython%2Fcpython.git

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 2bfd9cd8ada6..bae4ae768df9 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:
diff --git a/Misc/NEWS b/Misc/NEWS
index 8dbc1f3c74f3..2d12879e6f0a 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -18,6 +18,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #10695: passing the port as a string value to telnetlib no longer
+  causes debug mode to fail.
+
 - Issue #10107: Warn about unsaved files in IDLE on OSX.
 
 - Issue #10406: Enable Rstrip IDLE extension on OSX (just like on other