2002-02-17 02:23:30 +08:00
|
|
|
/* Socket module header file */
|
|
|
|
|
|
|
|
/* Includes needed for the sockaddr_* symbols below */
|
|
|
|
#ifndef MS_WINDOWS
|
2003-05-03 17:14:54 +08:00
|
|
|
#ifdef __VMS
|
|
|
|
# include <socket.h>
|
|
|
|
# else
|
|
|
|
# include <sys/socket.h>
|
|
|
|
# endif
|
2002-02-17 02:23:30 +08:00
|
|
|
# include <netinet/in.h>
|
2007-12-01 07:34:21 +08:00
|
|
|
# if !(defined(__CYGWIN__) || (defined(PYOS_OS2) && defined(PYCC_VACPP)))
|
2002-02-17 02:23:30 +08:00
|
|
|
# include <netinet/tcp.h>
|
|
|
|
# endif
|
|
|
|
|
|
|
|
#else /* MS_WINDOWS */
|
2002-03-01 16:31:07 +08:00
|
|
|
#if _MSC_VER >= 1300
|
|
|
|
# include <winsock2.h>
|
|
|
|
# include <ws2tcpip.h>
|
|
|
|
# define HAVE_ADDRINFO
|
|
|
|
# define HAVE_SOCKADDR_STORAGE
|
|
|
|
# define HAVE_GETADDRINFO
|
|
|
|
# define HAVE_GETNAMEINFO
|
|
|
|
# define ENABLE_IPV6
|
|
|
|
#else
|
2002-02-17 02:23:30 +08:00
|
|
|
# include <winsock.h>
|
|
|
|
#endif
|
2002-03-01 16:31:07 +08:00
|
|
|
#endif
|
2002-02-17 02:23:30 +08:00
|
|
|
|
|
|
|
#ifdef HAVE_SYS_UN_H
|
|
|
|
# include <sys/un.h>
|
|
|
|
#else
|
|
|
|
# undef AF_UNIX
|
|
|
|
#endif
|
|
|
|
|
2006-01-15 02:12:57 +08:00
|
|
|
#ifdef HAVE_LINUX_NETLINK_H
|
2006-01-16 12:31:40 +08:00
|
|
|
# ifdef HAVE_ASM_TYPES_H
|
|
|
|
# include <asm/types.h>
|
|
|
|
# endif
|
2006-01-15 02:12:57 +08:00
|
|
|
# include <linux/netlink.h>
|
|
|
|
#else
|
|
|
|
# undef AF_NETLINK
|
|
|
|
#endif
|
|
|
|
|
2004-01-31 20:34:17 +08:00
|
|
|
#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
|
|
|
|
#include <bluetooth/bluetooth.h>
|
|
|
|
#include <bluetooth/rfcomm.h>
|
|
|
|
#include <bluetooth/l2cap.h>
|
|
|
|
#include <bluetooth/sco.h>
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 23:07:44 +08:00
|
|
|
#include <bluetooth/hci.h>
|
2004-01-31 20:34:17 +08:00
|
|
|
#endif
|
|
|
|
|
2004-02-02 16:48:45 +08:00
|
|
|
#ifdef HAVE_BLUETOOTH_H
|
|
|
|
#include <bluetooth.h>
|
|
|
|
#endif
|
|
|
|
|
2002-02-17 02:23:30 +08:00
|
|
|
#ifdef HAVE_NETPACKET_PACKET_H
|
|
|
|
# include <sys/ioctl.h>
|
|
|
|
# include <net/if.h>
|
|
|
|
# include <netpacket/packet.h>
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifndef Py__SOCKET_H
|
|
|
|
#define Py__SOCKET_H
|
|
|
|
#ifdef __cplusplus
|
|
|
|
extern "C" {
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Python module and C API name */
|
|
|
|
#define PySocket_MODULE_NAME "_socket"
|
|
|
|
#define PySocket_CAPI_NAME "CAPI"
|
|
|
|
|
|
|
|
/* Abstract the socket file descriptor type */
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
typedef SOCKET SOCKET_T;
|
|
|
|
# ifdef MS_WIN64
|
|
|
|
# define SIZEOF_SOCKET_T 8
|
|
|
|
# else
|
|
|
|
# define SIZEOF_SOCKET_T 4
|
|
|
|
# endif
|
|
|
|
#else
|
|
|
|
typedef int SOCKET_T;
|
|
|
|
# define SIZEOF_SOCKET_T SIZEOF_INT
|
|
|
|
#endif
|
|
|
|
|
2005-09-15 02:09:42 +08:00
|
|
|
/* Socket address */
|
|
|
|
typedef union sock_addr {
|
|
|
|
struct sockaddr_in in;
|
|
|
|
#ifdef AF_UNIX
|
|
|
|
struct sockaddr_un un;
|
|
|
|
#endif
|
2006-01-15 02:12:57 +08:00
|
|
|
#ifdef AF_NETLINK
|
|
|
|
struct sockaddr_nl nl;
|
|
|
|
#endif
|
2005-09-15 02:09:42 +08:00
|
|
|
#ifdef ENABLE_IPV6
|
|
|
|
struct sockaddr_in6 in6;
|
|
|
|
struct sockaddr_storage storage;
|
|
|
|
#endif
|
|
|
|
#ifdef HAVE_BLUETOOTH_BLUETOOTH_H
|
|
|
|
struct sockaddr_l2 bt_l2;
|
|
|
|
struct sockaddr_rc bt_rc;
|
|
|
|
struct sockaddr_sco bt_sco;
|
Merged revisions 53623-53858 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r53624 | peter.astrand | 2007-02-02 20:06:36 +0100 (Fri, 02 Feb 2007) | 1 line
We had several if statements checking the value of a fd. This is unsafe, since valid fds might be zero. We should check for not None instead.
........
r53635 | kurt.kaiser | 2007-02-05 07:03:18 +0100 (Mon, 05 Feb 2007) | 2 lines
Add 'raw' support to configHandler. Patch 1650174 Tal Einat.
........
r53641 | kurt.kaiser | 2007-02-06 00:02:16 +0100 (Tue, 06 Feb 2007) | 5 lines
1. Calltips now 'handle' tuples in the argument list (display '<tuple>' :)
Suggested solution by Christos Georgiou, Bug 791968.
2. Clean up tests, were not failing when they should have been.
4. Remove some camelcase and an unneeded try/except block.
........
r53644 | kurt.kaiser | 2007-02-06 04:21:40 +0100 (Tue, 06 Feb 2007) | 2 lines
Clean up ModifiedInterpreter.runcode() structure
........
r53646 | peter.astrand | 2007-02-06 16:37:50 +0100 (Tue, 06 Feb 2007) | 1 line
Applied patch 1124861.3.patch to solve bug #1124861: Automatically create pipes on Windows, if GetStdHandle fails. Will backport.
........
r53648 | lars.gustaebel | 2007-02-06 19:38:13 +0100 (Tue, 06 Feb 2007) | 4 lines
Patch #1652681: create nonexistent files in append mode and
allow appending to empty files.
........
r53649 | kurt.kaiser | 2007-02-06 20:09:43 +0100 (Tue, 06 Feb 2007) | 4 lines
Updated patch (CodeContext.061217.patch) to
[ 1362975 ] CodeContext - Improved text indentation
Tal Einat 16Dec06
........
r53650 | kurt.kaiser | 2007-02-06 20:21:19 +0100 (Tue, 06 Feb 2007) | 2 lines
narrow exception per [ 1540849 ] except too broad
........
r53653 | kurt.kaiser | 2007-02-07 04:39:41 +0100 (Wed, 07 Feb 2007) | 4 lines
[ 1621265 ] Auto-completion list placement
Move AC window below input line unless not enough space, then put it above.
Patch: Tal Einat
........
r53654 | kurt.kaiser | 2007-02-07 09:07:13 +0100 (Wed, 07 Feb 2007) | 2 lines
Handle AttributeError during calltip lookup
........
r53656 | raymond.hettinger | 2007-02-07 21:08:22 +0100 (Wed, 07 Feb 2007) | 3 lines
SF #1615701: make d.update(m) honor __getitem__() and keys() in dict subclasses
........
r53658 | raymond.hettinger | 2007-02-07 22:04:20 +0100 (Wed, 07 Feb 2007) | 1 line
SF: 1397711 Set docs conflated immutable and hashable
........
r53660 | raymond.hettinger | 2007-02-07 22:42:17 +0100 (Wed, 07 Feb 2007) | 1 line
Check for a common user error with defaultdict().
........
r53662 | raymond.hettinger | 2007-02-07 23:24:07 +0100 (Wed, 07 Feb 2007) | 1 line
Bug #1575169: operator.isSequenceType() now returns False for subclasses of dict.
........
r53664 | raymond.hettinger | 2007-02-08 00:49:03 +0100 (Thu, 08 Feb 2007) | 1 line
Silence compiler warning
........
r53666 | raymond.hettinger | 2007-02-08 01:07:32 +0100 (Thu, 08 Feb 2007) | 1 line
Do not let overflows in enumerate() and count() pass silently.
........
r53668 | raymond.hettinger | 2007-02-08 01:50:39 +0100 (Thu, 08 Feb 2007) | 1 line
Bypass set specific optimizations for set and frozenset subclasses.
........
r53670 | raymond.hettinger | 2007-02-08 02:42:35 +0100 (Thu, 08 Feb 2007) | 1 line
Fix docstring bug
........
r53671 | martin.v.loewis | 2007-02-08 10:13:36 +0100 (Thu, 08 Feb 2007) | 3 lines
Bug #1653736: Complain about keyword arguments to time.isoformat.
Will backport to 2.5.
........
r53679 | kurt.kaiser | 2007-02-08 23:58:18 +0100 (Thu, 08 Feb 2007) | 6 lines
Corrected some bugs in AutoComplete. Also, Page Up/Down in ACW implemented;
mouse and cursor selection in ACWindow implemented; double Tab inserts current
selection and closes ACW (similar to double-click and Return); scroll wheel now
works in ACW. Added AutoComplete instructions to IDLE Help.
........
r53689 | martin.v.loewis | 2007-02-09 13:19:32 +0100 (Fri, 09 Feb 2007) | 3 lines
Bug #1653736: Properly discard third argument to slot_nb_inplace_power.
Will backport.
........
r53691 | martin.v.loewis | 2007-02-09 13:36:48 +0100 (Fri, 09 Feb 2007) | 4 lines
Bug #1600860: Search for shared python library in LIBDIR, not
lib/python/config, on "linux" and "gnu" systems.
Will backport.
........
r53693 | martin.v.loewis | 2007-02-09 13:58:49 +0100 (Fri, 09 Feb 2007) | 2 lines
Update broken link. Will backport to 2.5.
........
r53697 | georg.brandl | 2007-02-09 19:48:41 +0100 (Fri, 09 Feb 2007) | 2 lines
Bug #1656078: typo in in profile docs.
........
r53731 | brett.cannon | 2007-02-11 06:36:00 +0100 (Sun, 11 Feb 2007) | 3 lines
Change a very minor inconsistency (that is purely cosmetic) in the AST
definition.
........
r53735 | skip.montanaro | 2007-02-11 19:24:37 +0100 (Sun, 11 Feb 2007) | 1 line
fix trace.py --ignore-dir
........
r53741 | brett.cannon | 2007-02-11 20:44:41 +0100 (Sun, 11 Feb 2007) | 3 lines
Check in changed Python-ast.c from a cosmetic change to Python.asdl (in
r53731).
........
r53751 | brett.cannon | 2007-02-12 04:51:02 +0100 (Mon, 12 Feb 2007) | 5 lines
Modify Parser/asdl_c.py so that the __version__ number for Python/Python-ast.c
is specified at the top of the file. Also add a note that Python/Python-ast.c
needs to be committed separately after a change to the AST grammar to capture
the revision number of the change (which is what __version__ is set to).
........
r53752 | lars.gustaebel | 2007-02-12 10:25:53 +0100 (Mon, 12 Feb 2007) | 3 lines
Bug #1656581: Point out that external file objects are supposed to be
at position 0.
........
r53754 | martin.v.loewis | 2007-02-12 13:21:10 +0100 (Mon, 12 Feb 2007) | 3 lines
Patch 1463026: Support default namespace in XMLGenerator.
Fixes #847665. Will backport.
........
r53757 | armin.rigo | 2007-02-12 17:23:24 +0100 (Mon, 12 Feb 2007) | 4 lines
Fix the line to what is my guess at the original author's meaning.
(The line has no effect anyway, but is present because it's
customary call the base class __init__).
........
r53763 | martin.v.loewis | 2007-02-13 09:34:45 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #685268: Consider a package's __path__ in imputil.
Will backport.
........
r53765 | martin.v.loewis | 2007-02-13 10:49:38 +0100 (Tue, 13 Feb 2007) | 2 lines
Patch #698833: Support file decryption in zipfile.
........
r53766 | martin.v.loewis | 2007-02-13 11:10:39 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1517891: Make 'a' create the file if it doesn't exist.
Fixes #1514451.
........
r53767 | martin.v.loewis | 2007-02-13 13:08:24 +0100 (Tue, 13 Feb 2007) | 3 lines
Bug #1658794: Remove extraneous 'this'.
Will backport to 2.5.
........
r53769 | martin.v.loewis | 2007-02-13 13:14:19 +0100 (Tue, 13 Feb 2007) | 3 lines
Patch #1657276: Make NETLINK_DNRTMSG conditional.
Will backport.
........
r53771 | lars.gustaebel | 2007-02-13 17:09:24 +0100 (Tue, 13 Feb 2007) | 4 lines
Patch #1647484: Renamed GzipFile's filename attribute to name. The
filename attribute is still accessible as a property that emits a
DeprecationWarning.
........
r53772 | lars.gustaebel | 2007-02-13 17:24:00 +0100 (Tue, 13 Feb 2007) | 3 lines
Strip the '.gz' extension from the filename that is written to the
gzip header.
........
r53774 | martin.v.loewis | 2007-02-14 11:07:37 +0100 (Wed, 14 Feb 2007) | 2 lines
Patch #1432399: Add HCI sockets.
........
r53775 | martin.v.loewis | 2007-02-14 12:30:07 +0100 (Wed, 14 Feb 2007) | 2 lines
Update 1432399 to removal of _BT_SOCKADDR_MEMB.
........
r53776 | martin.v.loewis | 2007-02-14 12:30:56 +0100 (Wed, 14 Feb 2007) | 3 lines
Ignore directory time stamps when considering
whether to rerun libffi configure.
........
r53778 | lars.gustaebel | 2007-02-14 15:45:12 +0100 (Wed, 14 Feb 2007) | 4 lines
A missing binary mode in AppendTest caused failures in Windows
Buildbot.
........
r53782 | martin.v.loewis | 2007-02-15 10:51:35 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1397848: add the reasoning behind no-resize-on-shrinkage.
........
r53783 | georg.brandl | 2007-02-15 11:37:59 +0100 (Thu, 15 Feb 2007) | 2 lines
Make functools.wraps() docs a bit clearer.
........
r53785 | georg.brandl | 2007-02-15 12:29:04 +0100 (Thu, 15 Feb 2007) | 2 lines
Patch #1494140: Add documentation for the new struct.Struct object.
........
r53787 | georg.brandl | 2007-02-15 12:29:55 +0100 (Thu, 15 Feb 2007) | 2 lines
Add missing \versionadded.
........
r53800 | brett.cannon | 2007-02-15 23:54:39 +0100 (Thu, 15 Feb 2007) | 11 lines
Update the encoding package's search function to use absolute imports when
calling __import__. This helps make the expected search locations for encoding
modules be more explicit.
One could use an explicit value for __path__ when making the call to __import__
to force the exact location searched for encodings. This would give the most
strict search path possible if one is worried about malicious code being
imported. The unfortunate side-effect of that is that if __path__ was modified
on 'encodings' on purpose in a safe way it would not be picked up in future
__import__ calls.
........
r53801 | brett.cannon | 2007-02-16 20:33:01 +0100 (Fri, 16 Feb 2007) | 2 lines
Make the __import__ call in encodings.__init__ absolute with a level 0 call.
........
r53809 | vinay.sajip | 2007-02-16 23:36:24 +0100 (Fri, 16 Feb 2007) | 1 line
Minor fix for currentframe (SF #1652788).
........
r53818 | raymond.hettinger | 2007-02-19 03:03:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Extend work on revision 52962: Eliminate redundant calls to PyObject_Hash().
........
r53820 | raymond.hettinger | 2007-02-19 05:08:43 +0100 (Mon, 19 Feb 2007) | 1 line
Add merge() function to heapq.
........
r53821 | raymond.hettinger | 2007-02-19 06:28:28 +0100 (Mon, 19 Feb 2007) | 1 line
Add tie-breaker count to preserve sort stability.
........
r53822 | raymond.hettinger | 2007-02-19 07:59:32 +0100 (Mon, 19 Feb 2007) | 1 line
Use C heapreplace() instead of slower _siftup() in pure python.
........
r53823 | raymond.hettinger | 2007-02-19 08:30:21 +0100 (Mon, 19 Feb 2007) | 1 line
Add test for merge stability
........
r53824 | raymond.hettinger | 2007-02-19 10:14:10 +0100 (Mon, 19 Feb 2007) | 1 line
Provide an example of defaultdict with non-zero constant factory function.
........
r53825 | lars.gustaebel | 2007-02-19 10:54:47 +0100 (Mon, 19 Feb 2007) | 2 lines
Moved misplaced news item.
........
r53826 | martin.v.loewis | 2007-02-19 11:55:19 +0100 (Mon, 19 Feb 2007) | 3 lines
Patch #1490190: posixmodule now includes os.chflags() and os.lchflags()
functions on platforms where the underlying system calls are available.
........
r53827 | raymond.hettinger | 2007-02-19 19:15:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup docstrings for merge().
........
r53829 | raymond.hettinger | 2007-02-19 21:44:04 +0100 (Mon, 19 Feb 2007) | 1 line
Fixup set/dict interoperability.
........
r53837 | raymond.hettinger | 2007-02-21 06:20:38 +0100 (Wed, 21 Feb 2007) | 1 line
Add itertools.izip_longest().
........
r53838 | raymond.hettinger | 2007-02-21 18:22:05 +0100 (Wed, 21 Feb 2007) | 1 line
Remove filler struct item and fix leak.
........
2007-02-23 23:07:44 +08:00
|
|
|
struct sockaddr_hci bt_hci;
|
2005-09-15 02:09:42 +08:00
|
|
|
#endif
|
|
|
|
#ifdef HAVE_NETPACKET_PACKET_H
|
|
|
|
struct sockaddr_ll ll;
|
|
|
|
#endif
|
|
|
|
} sock_addr_t;
|
|
|
|
|
2002-02-17 02:23:30 +08:00
|
|
|
/* The object holding a socket. It holds some extra information,
|
|
|
|
like the address family, which is used to decode socket address
|
|
|
|
arguments properly. */
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
PyObject_HEAD
|
|
|
|
SOCKET_T sock_fd; /* Socket file descriptor */
|
|
|
|
int sock_family; /* Address family, e.g., AF_INET */
|
|
|
|
int sock_type; /* Socket type, e.g., SOCK_STREAM */
|
|
|
|
int sock_proto; /* Protocol type, usually 0 */
|
2002-02-17 11:58:51 +08:00
|
|
|
PyObject *(*errorhandler)(void); /* Error handler; checks
|
2002-02-17 02:23:30 +08:00
|
|
|
errno, returns NULL and
|
|
|
|
sets a Python exception */
|
2002-06-13 23:07:44 +08:00
|
|
|
double sock_timeout; /* Operation timeout in seconds;
|
|
|
|
0.0 means non-blocking */
|
2002-02-17 02:23:30 +08:00
|
|
|
} PySocketSockObject;
|
|
|
|
|
|
|
|
/* --- C API ----------------------------------------------------*/
|
|
|
|
|
2002-02-25 22:45:40 +08:00
|
|
|
/* Short explanation of what this C API export mechanism does
|
|
|
|
and how it works:
|
|
|
|
|
|
|
|
The _ssl module needs access to the type object defined in
|
|
|
|
the _socket module. Since cross-DLL linking introduces a lot of
|
|
|
|
problems on many platforms, the "trick" is to wrap the
|
|
|
|
C API of a module in a struct which then gets exported to
|
|
|
|
other modules via a PyCObject.
|
|
|
|
|
|
|
|
The code in socketmodule.c defines this struct (which currently
|
|
|
|
only contains the type object reference, but could very
|
|
|
|
well also include other C APIs needed by other modules)
|
|
|
|
and exports it as PyCObject via the module dictionary
|
|
|
|
under the name "CAPI".
|
|
|
|
|
|
|
|
Other modules can now include the socketmodule.h file
|
|
|
|
which defines the needed C APIs to import and set up
|
|
|
|
a static copy of this struct in the importing module.
|
|
|
|
|
|
|
|
After initialization, the importing module can then
|
|
|
|
access the C APIs from the _socket module by simply
|
|
|
|
referring to the static struct, e.g.
|
|
|
|
|
|
|
|
Load _socket module and its C API; this sets up the global
|
|
|
|
PySocketModule:
|
|
|
|
|
|
|
|
if (PySocketModule_ImportModuleAndAPI())
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
Now use the C API as if it were defined in the using
|
|
|
|
module:
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "O!|zz:ssl",
|
|
|
|
|
|
|
|
PySocketModule.Sock_Type,
|
|
|
|
|
|
|
|
(PyObject*)&Sock,
|
|
|
|
&key_file, &cert_file))
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
Support could easily be extended to export more C APIs/symbols
|
|
|
|
this way. Currently, only the type object is exported,
|
|
|
|
other candidates would be socket constructors and socket
|
|
|
|
access functions.
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
2002-02-17 02:23:30 +08:00
|
|
|
/* C API for usage by other Python modules */
|
|
|
|
typedef struct {
|
2002-02-17 11:58:51 +08:00
|
|
|
PyTypeObject *Sock_Type;
|
2004-03-24 07:16:54 +08:00
|
|
|
PyObject *error;
|
2002-02-17 02:23:30 +08:00
|
|
|
} PySocketModule_APIObject;
|
2002-02-17 11:58:51 +08:00
|
|
|
|
|
|
|
/* XXX The net effect of the following appears to be to define a function
|
|
|
|
XXX named PySocketModule_APIObject in _ssl.c. It's unclear why it isn't
|
2002-02-25 22:45:40 +08:00
|
|
|
XXX defined there directly.
|
|
|
|
|
|
|
|
>>> It's defined here because other modules might also want to use
|
|
|
|
>>> the C API.
|
|
|
|
|
|
|
|
*/
|
2002-02-17 02:23:30 +08:00
|
|
|
#ifndef PySocket_BUILDING_SOCKET
|
|
|
|
|
|
|
|
/* --- C API ----------------------------------------------------*/
|
|
|
|
|
|
|
|
/* Interfacestructure to C API for other modules.
|
2002-06-07 10:27:50 +08:00
|
|
|
Call PySocketModule_ImportModuleAndAPI() to initialize this
|
2002-02-17 02:23:30 +08:00
|
|
|
structure. After that usage is simple:
|
|
|
|
|
|
|
|
if (!PyArg_ParseTuple(args, "O!|zz:ssl",
|
|
|
|
&PySocketModule.Sock_Type, (PyObject*)&Sock,
|
|
|
|
&key_file, &cert_file))
|
|
|
|
return NULL;
|
|
|
|
...
|
|
|
|
*/
|
|
|
|
|
2002-02-17 11:58:51 +08:00
|
|
|
static
|
2002-02-17 02:23:30 +08:00
|
|
|
PySocketModule_APIObject PySocketModule;
|
|
|
|
|
|
|
|
/* You *must* call this before using any of the functions in
|
|
|
|
PySocketModule and check its outcome; otherwise all accesses will
|
|
|
|
result in a segfault. Returns 0 on success. */
|
|
|
|
|
|
|
|
#ifndef DPRINTF
|
|
|
|
# define DPRINTF if (0) printf
|
|
|
|
#endif
|
|
|
|
|
|
|
|
static
|
|
|
|
int PySocketModule_ImportModuleAndAPI(void)
|
|
|
|
{
|
2002-02-17 11:58:51 +08:00
|
|
|
PyObject *mod = 0, *v = 0;
|
|
|
|
char *apimodule = PySocket_MODULE_NAME;
|
|
|
|
char *apiname = PySocket_CAPI_NAME;
|
|
|
|
void *api;
|
|
|
|
|
|
|
|
DPRINTF("Importing the %s C API...\n", apimodule);
|
Merged revisions 59666-59679 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r59666 | christian.heimes | 2008-01-02 19:28:32 +0100 (Wed, 02 Jan 2008) | 1 line
Made vs9to8 Unix compatible
........
r59669 | guido.van.rossum | 2008-01-02 20:00:46 +0100 (Wed, 02 Jan 2008) | 2 lines
Patch #1696. Don't attempt to close None in dry-run mode.
........
r59671 | jeffrey.yasskin | 2008-01-03 03:21:52 +0100 (Thu, 03 Jan 2008) | 6 lines
Backport PEP 3141 from the py3k branch to the trunk. This includes r50877 (just
the complex_pow part), r56649, r56652, r56715, r57296, r57302, r57359, r57361,
r57372, r57738, r57739, r58017, r58039, r58040, and r59390, and new
documentation. The only significant difference is that round(x) returns a float
to preserve backward-compatibility. See http://bugs.python.org/issue1689.
........
r59672 | christian.heimes | 2008-01-03 16:41:30 +0100 (Thu, 03 Jan 2008) | 1 line
Issue #1726: Remove Python/atof.c from PCBuild/pythoncore.vcproj
........
r59675 | guido.van.rossum | 2008-01-03 20:12:44 +0100 (Thu, 03 Jan 2008) | 4 lines
Issue #1700, reported by Nguyen Quan Son, fix by Fredruk Lundh:
Regular Expression inline flags not handled correctly for some unicode
characters. (Forward port from 2.5.2.)
........
r59676 | christian.heimes | 2008-01-03 21:23:15 +0100 (Thu, 03 Jan 2008) | 1 line
Added math.isinf() and math.isnan()
........
r59677 | christian.heimes | 2008-01-03 22:14:48 +0100 (Thu, 03 Jan 2008) | 1 line
Some build bots don't compile mathmodule. There is an issue with the long definition of pi and euler
........
r59678 | christian.heimes | 2008-01-03 23:16:32 +0100 (Thu, 03 Jan 2008) | 2 lines
Modified PyImport_Import and PyImport_ImportModule to always use absolute imports by calling __import__ with an explicit level of 0
Added a new API function PyImport_ImportModuleNoBlock. It solves the problem with dead locks when mixing threads and imports
........
r59679 | christian.heimes | 2008-01-03 23:32:26 +0100 (Thu, 03 Jan 2008) | 1 line
Added copysign(x, y) function to the math module
........
2008-01-04 07:01:04 +08:00
|
|
|
mod = PyImport_ImportModuleNoBlock(apimodule);
|
2002-02-17 11:58:51 +08:00
|
|
|
if (mod == NULL)
|
|
|
|
goto onError;
|
|
|
|
DPRINTF(" %s package found\n", apimodule);
|
|
|
|
v = PyObject_GetAttrString(mod, apiname);
|
|
|
|
if (v == NULL)
|
|
|
|
goto onError;
|
|
|
|
Py_DECREF(mod);
|
|
|
|
DPRINTF(" API object %s found\n", apiname);
|
|
|
|
api = PyCObject_AsVoidPtr(v);
|
|
|
|
if (api == NULL)
|
|
|
|
goto onError;
|
|
|
|
Py_DECREF(v);
|
|
|
|
memcpy(&PySocketModule, api, sizeof(PySocketModule));
|
|
|
|
DPRINTF(" API object loaded and initialized.\n");
|
|
|
|
return 0;
|
|
|
|
|
2002-02-17 02:23:30 +08:00
|
|
|
onError:
|
2002-02-17 11:58:51 +08:00
|
|
|
DPRINTF(" not found.\n");
|
|
|
|
Py_XDECREF(mod);
|
|
|
|
Py_XDECREF(v);
|
|
|
|
return -1;
|
2002-02-17 02:23:30 +08:00
|
|
|
}
|
|
|
|
|
2002-02-17 11:58:51 +08:00
|
|
|
#endif /* !PySocket_BUILDING_SOCKET */
|
2002-02-17 02:23:30 +08:00
|
|
|
|
|
|
|
#ifdef __cplusplus
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
#endif /* !Py__SOCKET_H */
|