Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merged revisions 77972 via svnmerge from 

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.
  ........
................
This commit is contained in:
Antoine Pitrou 2010-02-04 20:26:18 +00:00
parent a5b2873aef
commit c9213f5849
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Misc/NEWS
View File

@ -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

6
Modules/socketmodule.c
View File

@ -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;
}