[Python-checkins] r87232 - in python/branches/release27-maint: Lib/telnetlib.py Misc/NEWS

[r.david.murray]

Author: r.david.murray
Date: Tue Dec 14 15:34:16 2010
New Revision: 87232

Log:
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.
........


Modified:
   python/branches/release27-maint/   (props changed)
   python/branches/release27-maint/Lib/telnetlib.py
   python/branches/release27-maint/Misc/NEWS

Modified: python/branches/release27-maint/Lib/telnetlib.py
==============================================================================
--- python/branches/release27-maint/Lib/telnetlib.py	(original)
+++ python/branches/release27-maint/Lib/telnetlib.py	Tue Dec 14 15:34:16 2010
@@ -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:

Modified: python/branches/release27-maint/Misc/NEWS
==============================================================================
--- python/branches/release27-maint/Misc/NEWS	(original)
+++ python/branches/release27-maint/Misc/NEWS	Tue Dec 14 15:34:16 2010
@@ -18,6 +18,9 @@
 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