From: Antoine Pitrou <solipsis@pitrou.net>
Date: Thu, 17 Mar 2011 21:46:17 +0000 (+0100)
Subject: Issue #5421: merge fix
X-Git-Tag: v3.3.0a1~2891^2~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fee6684f3c26b1aa51a3688ad324747a770a9bb2;p=thirdparty%2FPython%2Fcpython.git

Issue #5421: merge fix
---

fee6684f3c26b1aa51a3688ad324747a770a9bb2
diff --cc Misc/NEWS
index d8e05fbfcce7,328e44d01d39..0828cd8df537
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@@ -72,8 -40,9 +72,11 @@@ Core and Builtin
  Library
  -------
  
+ - Issue #5421: Fix misleading error message when one of socket.sendto()'s
+   arguments has the wrong type.  Patch by Nikita Vetoshkin.
+ 
 +- Issue #10812: Add some extra posix functions to the os module.
 +
  - Issue #10979: unittest stdout buffering now works with class and module
    setup and teardown.