Merged revisions 77972 via svnmerge from

pitrou · pitrou · commit c9213f5849d5 · 2010-02-04T20:26:18.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k ................ r77972 | antoine.pitrou | 2010-02-04 21:23:24 +0100 (jeu., 04 févr. 2010) | 12 lines Merged revisions 77970 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r77970 | antoine.pitrou | 2010-02-04 21:20:18 +0100 (jeu., 04 févr. 2010) | 6 lines Issue #4772: Raise a ValueError when an unknown Bluetooth protocol is specified, rather than fall through to AF_PACKET (in the `socket` module). Also, raise ValueError rather than TypeError when an unknown TIPC address type is specified. Patch by Brian Curtin. ........ ................
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -79,6 +79,11 @@ Core and Builtins
 Library
 -------
 
+- Issue #4772: Raise a ValueError when an unknown Bluetooth protocol is
+  specified, rather than fall through to AF_PACKET (in the `socket` module).
+  Also, raise ValueError rather than TypeError when an unknown TIPC address
+  type is specified.  Patch by Brian Curtin.
+
 - Issue #6939: Fix file I/O objects in the `io` module to keep the original
   file position when calling `truncate()`.  It would previously change the
   file position to the given argument, which goes against the tradition of
diff --git a/Modules/socketmodule.c b/Modules/socketmodule.c
@@ -1053,6 +1053,10 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)
 		}
 #endif
 
+		default:
+			PyErr_SetString(PyExc_ValueError,
+					"Unknown Bluetooth protocol");
+			return NULL;
 		}
 #endif
 
@@ -1104,7 +1108,7 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)
 					0,
 					a->scope);
 		} else {
-			PyErr_SetString(PyExc_TypeError,
+			PyErr_SetString(PyExc_ValueError,
 					"Invalid address type");
 			return NULL;
 		}

Original file line number	Diff line number	Diff line change
`@@ -1053,6 +1053,10 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)`
`1053`	`1053`	`}`
`1054`	`1054`	`#endif`
`1055`	`1055`
	`1056`	`+ default:`
	`1057`	`+ PyErr_SetString(PyExc_ValueError,`
	`1058`	`+ "Unknown Bluetooth protocol");`
	`1059`	`+ return NULL;`
`1056`	`1060`	`}`
`1057`	`1061`	`#endif`
`1058`	`1062`
`@@ -1104,7 +1108,7 @@ makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)`
`1104`	`1108`	`0,`
`1105`	`1109`	`a->scope);`
`1106`	`1110`	`} else {`
`1107`		`- PyErr_SetString(PyExc_TypeError,`
	`1111`	`+ PyErr_SetString(PyExc_ValueError,`
`1108`	`1112`	`"Invalid address type");`
`1109`	`1113`	`return NULL;`
`1110`	`1114`	`}`