[Python-checkins] r77975 - in python/branches/release26-maint: Misc/NEWS Modules/socketmodule.c
antoine.pitrou
python-checkins at python.org
Thu Feb 4 21:26:35 CET 2010
Author: antoine.pitrou
Date: Thu Feb 4 21:26:34 2010
New Revision: 77975
Log:
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.
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Misc/NEWS
python/branches/release26-maint/Modules/socketmodule.c
Modified: python/branches/release26-maint/Misc/NEWS
==============================================================================
--- python/branches/release26-maint/Misc/NEWS (original)
+++ python/branches/release26-maint/Misc/NEWS Thu Feb 4 21:26:34 2010
@@ -58,6 +58,11 @@
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
Modified: python/branches/release26-maint/Modules/socketmodule.c
==============================================================================
--- python/branches/release26-maint/Modules/socketmodule.c (original)
+++ python/branches/release26-maint/Modules/socketmodule.c Thu Feb 4 21:26:34 2010
@@ -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;
}
More information about the Python-checkins
mailing list