diff Modules/socketmodule.c @ 58695:54e975582c65 legacy-trunk

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.
author Antoine Pitrou <solipsis@pitrou.net>
date Thu, 04 Feb 2010 20:20:18 +0000
parents 3def952b515c
children 435fa215d33f
line wrap: on
line diff
--- a/Modules/socketmodule.c	Thu Feb 04 20:18:28 2010 +0000
+++ b/Modules/socketmodule.c	Thu Feb 04 20:20:18 2010 +0000
@@ -1089,6 +1089,10 @@
 		}
 #endif
 
+		default:
+			PyErr_SetString(PyExc_ValueError,
+					"Unknown Bluetooth protocol");
+			return NULL;
 		}
 #endif
 
@@ -1140,7 +1144,7 @@
 					0,
 					a->scope);
 		} else {
-			PyErr_SetString(PyExc_TypeError,
+			PyErr_SetString(PyExc_ValueError,
 					"Invalid address type");
 			return NULL;
 		}