mirror of
https://github.com/python/cpython.git
synced 2024-12-12 19:33:52 +08:00
0e3f591aee
svn+ssh://pythondev@svn.python.org/python/trunk ........ r46755 | brett.cannon | 2006-06-08 18:23:04 +0200 (Thu, 08 Jun 2006) | 4 lines Make binascii.hexlify() use s# for its arguments instead of t# to actually match its documentation stating it accepts any read-only buffer. ........ r46757 | brett.cannon | 2006-06-08 19:00:45 +0200 (Thu, 08 Jun 2006) | 8 lines Buffer objects would return the read or write buffer for a wrapped object when the char buffer was requested. Now it actually returns the char buffer if available or raises a TypeError if it isn't (as is raised for the other buffer types if they are not present but requested). Not a backport candidate since it does change semantics of the buffer object (although it could be argued this is enough of a bug to bother backporting). ........ r46760 | andrew.kuchling | 2006-06-09 03:10:17 +0200 (Fri, 09 Jun 2006) | 1 line Update functools section ........ r46762 | tim.peters | 2006-06-09 04:11:02 +0200 (Fri, 09 Jun 2006) | 6 lines Whitespace normalization. Since test_file is implicated in mysterious test failures when followed by test_optparse, if I had any brains I'd look at the checkin that last changed test_file ;-) ........ r46763 | tim.peters | 2006-06-09 05:09:42 +0200 (Fri, 09 Jun 2006) | 5 lines To boost morale :-), force test_optparse to run immediately after test_file until we can figure out how to fix it. (See python-dev; at the moment we don't even know which checkin caused the problem.) ........ r46764 | tim.peters | 2006-06-09 05:51:41 +0200 (Fri, 09 Jun 2006) | 6 lines AutoFileTests.tearDown(): Removed mysterious undocumented try/except. Remove TESTFN. Throughout: used open() instead of file(), and wrapped long lines. ........ r46765 | tim.peters | 2006-06-09 06:02:06 +0200 (Fri, 09 Jun 2006) | 8 lines testUnicodeOpen(): I have no idea why, but making this test clean up after itself appears to fix the test failures when test_optparse follows test_file. test_main(): Get rid of TESTFN no matter what. That's also enough to fix the mystery failures. Doesn't hurt to fix them twice :-) ........ r46766 | tim.peters | 2006-06-09 07:12:40 +0200 (Fri, 09 Jun 2006) | 6 lines Remove the temporary hack to force test_optparse to run immediately after test_file. At least 8 buildbot boxes passed since the underlying problem got fixed, and they all failed before the fix, so there's no point to this anymore. ........ r46767 | neal.norwitz | 2006-06-09 07:54:18 +0200 (Fri, 09 Jun 2006) | 1 line Fix grammar and reflow ........ r46769 | andrew.kuchling | 2006-06-09 12:22:35 +0200 (Fri, 09 Jun 2006) | 1 line Markup fix ........ r46773 | andrew.kuchling | 2006-06-09 15:15:57 +0200 (Fri, 09 Jun 2006) | 1 line [Bug #1472827] Make saxutils.XMLGenerator handle \r\n\t in attribute values by escaping them properly. 2.4 bugfix candidate. ........ r46778 | kristjan.jonsson | 2006-06-09 18:28:01 +0200 (Fri, 09 Jun 2006) | 2 lines Turn off warning about deprecated CRT functions on for VisualStudio .NET 2005. Make the definition #ARRAYSIZE conditional. VisualStudio .NET 2005 already has it defined using a better gimmick. ........ r46779 | phillip.eby | 2006-06-09 18:40:18 +0200 (Fri, 09 Jun 2006) | 2 lines Import wsgiref into the stdlib, as of the external version 0.1-r2181. ........ r46783 | andrew.kuchling | 2006-06-09 18:44:40 +0200 (Fri, 09 Jun 2006) | 1 line Add note about XMLGenerator bugfix ........ r46784 | andrew.kuchling | 2006-06-09 18:46:51 +0200 (Fri, 09 Jun 2006) | 1 line Add note about wsgiref ........ r46785 | brett.cannon | 2006-06-09 19:05:48 +0200 (Fri, 09 Jun 2006) | 2 lines Fix inconsistency in naming within an enum. ........ r46787 | tim.peters | 2006-06-09 19:47:00 +0200 (Fri, 09 Jun 2006) | 2 lines Whitespace normalization. ........ r46792 | georg.brandl | 2006-06-09 20:29:52 +0200 (Fri, 09 Jun 2006) | 3 lines Test file.__exit__. ........ r46794 | brett.cannon | 2006-06-09 20:40:46 +0200 (Fri, 09 Jun 2006) | 2 lines svn:ignore .pyc and .pyo files. ........ r46795 | georg.brandl | 2006-06-09 20:45:48 +0200 (Fri, 09 Jun 2006) | 3 lines RFE #1491485: str/unicode.endswith()/startswith() now accept a tuple as first argument. ........ r46798 | andrew.kuchling | 2006-06-09 21:03:16 +0200 (Fri, 09 Jun 2006) | 1 line Describe startswith()/endswiith() change; add reminder about wsgiref ........ r46799 | tim.peters | 2006-06-09 21:24:44 +0200 (Fri, 09 Jun 2006) | 11 lines Implementing a happy idea from Georg Brandl: make runtest() try to clean up files and directories the tests often leave behind by mistake. This is the first time in history I don't have a bogus "db_home" directory after running the tests ;-) Also worked on runtest's docstring, to say something about all the arguments, and to document the non-obvious return values. New functions runtest_inner() and cleanup_test_droppings() in support of the above. ........ r46800 | andrew.kuchling | 2006-06-09 21:43:25 +0200 (Fri, 09 Jun 2006) | 1 line Remove unused variable ........ r46801 | andrew.kuchling | 2006-06-09 21:56:05 +0200 (Fri, 09 Jun 2006) | 1 line Add some wsgiref text ........ r46803 | thomas.heller | 2006-06-09 21:59:11 +0200 (Fri, 09 Jun 2006) | 1 line set eol-style svn property ........ r46804 | thomas.heller | 2006-06-09 22:01:01 +0200 (Fri, 09 Jun 2006) | 1 line set eol-style svn property ........ r46805 | georg.brandl | 2006-06-09 22:43:48 +0200 (Fri, 09 Jun 2006) | 3 lines Make use of new str.startswith/endswith semantics. Occurences in email and compiler were ignored due to backwards compat requirements. ........ r46806 | brett.cannon | 2006-06-10 00:31:23 +0200 (Sat, 10 Jun 2006) | 4 lines An object with __call__ as an attribute, when called, will have that attribute checked for __call__ itself, and will continue to look until it finds an object without the attribute. This can lead to an infinite recursion. Closes bug #532646, again. Will be backported. ........ r46808 | brett.cannon | 2006-06-10 00:45:54 +0200 (Sat, 10 Jun 2006) | 2 lines Fix bug introduced in rev. 46806 by not having variable declaration at the top of a block. ........ r46812 | georg.brandl | 2006-06-10 08:40:50 +0200 (Sat, 10 Jun 2006) | 4 lines Apply perky's fix for #1503157: "/".join([u"", u""]) raising OverflowError. Also improve error message on overflow. ........ r46817 | martin.v.loewis | 2006-06-10 10:14:03 +0200 (Sat, 10 Jun 2006) | 2 lines Port cygwin kill_python changes from 2.4 branch. ........ r46818 | armin.rigo | 2006-06-10 12:57:40 +0200 (Sat, 10 Jun 2006) | 4 lines SF bug #1503294. PyThreadState_GET() complains if the tstate is NULL, but only in debug mode. ........ r46819 | martin.v.loewis | 2006-06-10 14:23:46 +0200 (Sat, 10 Jun 2006) | 4 lines Patch #1495999: Part two of Windows CE changes. - update header checks, using autoconf - provide dummies for getenv, environ, and GetVersion - adjust MSC_VER check in socketmodule.c ........ r46820 | skip.montanaro | 2006-06-10 16:09:11 +0200 (Sat, 10 Jun 2006) | 1 line document the class, not its initializer ........ r46821 | greg.ward | 2006-06-10 18:40:01 +0200 (Sat, 10 Jun 2006) | 4 lines Sync with Optik docs (rev 518): * restore "Extending optparse" section * document ALWAYS_TYPED_ACTIONS (SF #1449311) ........ r46824 | thomas.heller | 2006-06-10 21:51:46 +0200 (Sat, 10 Jun 2006) | 8 lines Upgrade to ctypes version 0.9.9.7. Summary of changes: - support for 'variable sized' data - support for anonymous structure/union fields - fix severe bug with certain arrays or structures containing more than 256 fields ........ r46825 | thomas.heller | 2006-06-10 21:55:36 +0200 (Sat, 10 Jun 2006) | 8 lines Upgrade to ctypes version 0.9.9.7. Summary of changes: - support for 'variable sized' data - support for anonymous structure/union fields - fix severe bug with certain arrays or structures containing more than 256 fields ........ r46826 | fred.drake | 2006-06-10 22:01:34 +0200 (Sat, 10 Jun 2006) | 4 lines SF patch #1303595: improve description of __builtins__, explaining how it varies between __main__ and other modules, and strongly suggest not touching it but using __builtin__ if absolutely necessary ........ r46827 | fred.drake | 2006-06-10 22:02:58 +0200 (Sat, 10 Jun 2006) | 1 line credit for SF patch #1303595 ........ r46831 | thomas.heller | 2006-06-10 22:29:34 +0200 (Sat, 10 Jun 2006) | 2 lines New docs for ctypes. ........ r46834 | thomas.heller | 2006-06-10 23:07:19 +0200 (Sat, 10 Jun 2006) | 1 line Fix a wrong printf format. ........ r46835 | thomas.heller | 2006-06-10 23:17:58 +0200 (Sat, 10 Jun 2006) | 1 line Fix the second occurrence of the problematic printf format. ........ r46837 | thomas.heller | 2006-06-10 23:56:03 +0200 (Sat, 10 Jun 2006) | 1 line Don't use C++ comment. ........ r46838 | thomas.heller | 2006-06-11 00:01:50 +0200 (Sun, 11 Jun 2006) | 1 line Handle failure of PyMem_Realloc. ........ r46839 | skip.montanaro | 2006-06-11 00:38:13 +0200 (Sun, 11 Jun 2006) | 2 lines Suppress warning on MacOSX about possible use before set of proc. ........ r46840 | tim.peters | 2006-06-11 00:51:45 +0200 (Sun, 11 Jun 2006) | 8 lines shuffle() doscstring: Removed warning about sequence length versus generator period. While this was a real weakness of the older WH generator for lists with just a few dozen elements, and so could potentially bite the naive ;-), the Twister should show excellent behavior up to at least 600 elements. Module docstring: reflowed some jarringly short lines. ........ r46844 | greg.ward | 2006-06-11 02:40:49 +0200 (Sun, 11 Jun 2006) | 4 lines Bug #1361643: fix textwrap.dedent() so it handles tabs appropriately, i.e. do *not* expand tabs, but treat them as whitespace that is not equivalent to spaces. Add a couple of test cases. Clarify docs. ........ r46850 | neal.norwitz | 2006-06-11 07:44:18 +0200 (Sun, 11 Jun 2006) | 5 lines Fix Coverity # 146. newDBSequenceObject would deref dbobj, so it can't be NULL. We know it's not NULL from the ParseTuple and DbObject_Check will verify it's not NULL. ........ r46851 | neal.norwitz | 2006-06-11 07:45:25 +0200 (Sun, 11 Jun 2006) | 4 lines Wrap some long lines Top/Bottom factor out some common expressions Add a XXX comment about widing offset. ........ r46852 | neal.norwitz | 2006-06-11 07:45:47 +0200 (Sun, 11 Jun 2006) | 1 line Add versionadded to doc ........ r46853 | neal.norwitz | 2006-06-11 07:47:14 +0200 (Sun, 11 Jun 2006) | 3 lines Update doc to make it agree with code. Bottom factor out some common code. ........ r46854 | neal.norwitz | 2006-06-11 07:48:14 +0200 (Sun, 11 Jun 2006) | 3 lines f_code can't be NULL based on Frame_New and other code that derefs it. So there doesn't seem to be much point to checking here. ........ r46855 | neal.norwitz | 2006-06-11 09:26:27 +0200 (Sun, 11 Jun 2006) | 1 line Fix errors found by pychecker ........ r46856 | neal.norwitz | 2006-06-11 09:26:50 +0200 (Sun, 11 Jun 2006) | 1 line warnings was imported at module scope, no need to import again ........ r46857 | neal.norwitz | 2006-06-11 09:27:56 +0200 (Sun, 11 Jun 2006) | 5 lines Fix errors found by pychecker. I think these changes are correct, but I'm not sure. Could someone who knows how this module works test it? It can at least start on the cmd line. ........ r46858 | neal.norwitz | 2006-06-11 10:35:14 +0200 (Sun, 11 Jun 2006) | 1 line Fix errors found by pychecker ........ r46859 | ronald.oussoren | 2006-06-11 16:33:36 +0200 (Sun, 11 Jun 2006) | 4 lines This patch improves the L&F of IDLE on OSX. The changes are conditionalized on being in an IDLE.app bundle on darwin. This does a slight reorganisation of the menus and adds support for file-open events. ........ r46860 | greg.ward | 2006-06-11 16:42:41 +0200 (Sun, 11 Jun 2006) | 1 line SF #1366250: optparse docs: fix inconsistency in variable name; minor tweaks. ........ r46861 | greg.ward | 2006-06-11 18:24:11 +0200 (Sun, 11 Jun 2006) | 3 lines Bug #1498146: fix optparse to handle Unicode strings in option help, description, and epilog. ........ r46862 | thomas.heller | 2006-06-11 19:04:22 +0200 (Sun, 11 Jun 2006) | 2 lines Release the GIL during COM method calls, to avoid deadlocks in Python coded COM objects. ........ r46863 | tim.peters | 2006-06-11 21:42:51 +0200 (Sun, 11 Jun 2006) | 2 lines Whitespace normalization. ........ r46864 | tim.peters | 2006-06-11 21:43:49 +0200 (Sun, 11 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46865 | ronald.oussoren | 2006-06-11 21:45:57 +0200 (Sun, 11 Jun 2006) | 2 lines Remove message about using make frameworkinstall, that's no longer necesssary ........ r46866 | ronald.oussoren | 2006-06-11 22:23:29 +0200 (Sun, 11 Jun 2006) | 2 lines Use configure to substitute the correct prefix instead of hardcoding ........ r46867 | ronald.oussoren | 2006-06-11 22:24:45 +0200 (Sun, 11 Jun 2006) | 4 lines - Change fixapplepython23.py to ensure that it will run with /usr/bin/python on intel macs. - Fix some minor problems in the installer for OSX ........ r46868 | neal.norwitz | 2006-06-11 22:25:56 +0200 (Sun, 11 Jun 2006) | 5 lines Try to fix several networking tests. The problem is that if hosts have a search path setup, some of these hosts resolve to the wrong address. By appending a period to the hostname, the hostname should only resolve to what we want it to resolve to. Hopefully this doesn't break different bots. ........ r46869 | neal.norwitz | 2006-06-11 22:42:02 +0200 (Sun, 11 Jun 2006) | 7 lines Try to fix another networking test. The problem is that if hosts have a search path setup, some of these hosts resolve to the wrong address. By appending a period to the hostname, the hostname should only resolve to what we want it to resolve to. Hopefully this doesn't break different bots. Also add more info to failure message to aid debugging test failure. ........ r46870 | neal.norwitz | 2006-06-11 22:46:46 +0200 (Sun, 11 Jun 2006) | 4 lines Fix test on PPC64 buildbot. It raised an IOError (really an URLError which derives from an IOError). That seems valid. Env Error includes both OSError and IOError, so this seems like a reasonable fix. ........ r46871 | tim.peters | 2006-06-11 22:52:59 +0200 (Sun, 11 Jun 2006) | 10 lines compare_generic_iter(): Fixed the failure of test_wsgiref's testFileWrapper when running with -O. test_simple_validation_error still fails under -O. That appears to be because wsgiref's validate.py uses `assert` statements all over the place to check arguments for sanity. That should all be changed (it's not a logical error in the software if a user passes bogus arguments, so this isn't a reasonable use for `assert` -- checking external preconditions should generally raise ValueError or TypeError instead, as appropriate). ........ r46872 | neal.norwitz | 2006-06-11 23:38:38 +0200 (Sun, 11 Jun 2006) | 1 line Get test to pass on S/390. Shout if you think this change is incorrect. ........ r46873 | neal.norwitz | 2006-06-12 04:05:55 +0200 (Mon, 12 Jun 2006) | 1 line Cleanup Py_ssize_t a little (get rid of second #ifdef) ........ r46874 | neal.norwitz | 2006-06-12 04:06:17 +0200 (Mon, 12 Jun 2006) | 1 line Fix some Py_ssize_t issues ........ r46875 | neal.norwitz | 2006-06-12 04:06:42 +0200 (Mon, 12 Jun 2006) | 1 line Fix some Py_ssize_t issues ........ r46876 | neal.norwitz | 2006-06-12 04:07:24 +0200 (Mon, 12 Jun 2006) | 2 lines Cleanup: Remove import of types to get StringTypes, we can just use basestring. ........ r46877 | neal.norwitz | 2006-06-12 04:07:57 +0200 (Mon, 12 Jun 2006) | 1 line Don't truncate if size_t is bigger than uint ........ r46878 | neal.norwitz | 2006-06-12 04:08:41 +0200 (Mon, 12 Jun 2006) | 1 line Don't leak the list object if there's an error allocating the item storage. Backport candidate ........ r46879 | neal.norwitz | 2006-06-12 04:09:03 +0200 (Mon, 12 Jun 2006) | 1 line Fix typo. Backport if anyone cares. :-) ........ r46880 | neal.norwitz | 2006-06-12 04:09:34 +0200 (Mon, 12 Jun 2006) | 1 line Fix indentation of case and a Py_ssize_t issue. ........ r46881 | neal.norwitz | 2006-06-12 04:11:18 +0200 (Mon, 12 Jun 2006) | 3 lines Get rid of f_restricted too. Doc the other 4 ints that were already removed at the NeedForSpeed sprint. ........ r46882 | neal.norwitz | 2006-06-12 04:13:21 +0200 (Mon, 12 Jun 2006) | 1 line Fix the socket tests so they can be run concurrently. Backport candidate ........ r46883 | neal.norwitz | 2006-06-12 04:16:10 +0200 (Mon, 12 Jun 2006) | 1 line i and j are initialized below when used. No need to do it twice ........ r46884 | neal.norwitz | 2006-06-12 05:05:03 +0200 (Mon, 12 Jun 2006) | 1 line Remove unused import ........ r46885 | neal.norwitz | 2006-06-12 05:05:40 +0200 (Mon, 12 Jun 2006) | 1 line Impl ssize_t ........ r46886 | neal.norwitz | 2006-06-12 05:33:09 +0200 (Mon, 12 Jun 2006) | 6 lines Patch #1503046, Conditional compilation of zlib.(de)compressobj.copy copy is only in newer versions of zlib. This should allow zlibmodule to work with older versions like the Tru64 buildbot. ........ r46887 | phillip.eby | 2006-06-12 06:04:32 +0200 (Mon, 12 Jun 2006) | 2 lines Sync w/external release 0.1.2. Please see PEP 360 before making changes to external packages. ........ r46888 | martin.v.loewis | 2006-06-12 06:26:31 +0200 (Mon, 12 Jun 2006) | 2 lines Get rid of function pointer cast. ........ r46889 | thomas.heller | 2006-06-12 08:05:57 +0200 (Mon, 12 Jun 2006) | 3 lines I don't know how that happend, but the entire file contents was duplicated. Thanks to Simon Percivall for the heads up. ........ r46890 | nick.coghlan | 2006-06-12 10:19:37 +0200 (Mon, 12 Jun 2006) | 1 line Fix site module docstring to match the code ........ r46891 | nick.coghlan | 2006-06-12 10:23:02 +0200 (Mon, 12 Jun 2006) | 1 line Fix site module docstring to match the code for Mac OSX, too ........ r46892 | nick.coghlan | 2006-06-12 10:27:13 +0200 (Mon, 12 Jun 2006) | 1 line The site module documentation also described the Windows behaviour incorrectly. ........ r46893 | nick.coghlan | 2006-06-12 12:17:11 +0200 (Mon, 12 Jun 2006) | 1 line Make the -m switch conform to the documentation of sys.path by behaving like the -c switch ........ r46894 | kristjan.jonsson | 2006-06-12 17:45:12 +0200 (Mon, 12 Jun 2006) | 2 lines Fix the CRT argument error handling for VisualStudio .NET 2005. Install a CRT error handler and disable the assertion for debug builds. This causes CRT to set errno to EINVAL. This update fixes crash cases in the test suite where the default CRT error handler would cause process exit. ........ r46899 | thomas.heller | 2006-06-12 22:56:48 +0200 (Mon, 12 Jun 2006) | 1 line Add pep-291 compatibility markers. ........ r46901 | ka-ping.yee | 2006-06-13 01:47:52 +0200 (Tue, 13 Jun 2006) | 5 lines Add the uuid module. This module has been tested so far on Windows XP (Python 2.4 and 2.5a2), Mac OS X (Python 2.3, 2.4, and 2.5a2), and Linux (Python 2.4 and 2.5a2). ........ r46902 | tim.peters | 2006-06-13 02:30:01 +0200 (Tue, 13 Jun 2006) | 2 lines Whitespace normalization. ........ r46903 | tim.peters | 2006-06-13 02:30:50 +0200 (Tue, 13 Jun 2006) | 2 lines Added missing svn:eol-style property to text files. ........ r46905 | tim.peters | 2006-06-13 05:30:07 +0200 (Tue, 13 Jun 2006) | 5 lines get_matching_blocks(): rewrote code & comments so they match; added more comments about why it's this way at all; and removed what looked like needless expense (sorting (i, j, k) triples directly should give exactly the same order as sorting (i, (i, j, k)) pairs). ........ r46906 | neal.norwitz | 2006-06-13 06:08:53 +0200 (Tue, 13 Jun 2006) | 1 line Don't fail if another process is listening on our port. ........ r46908 | neal.norwitz | 2006-06-13 10:28:19 +0200 (Tue, 13 Jun 2006) | 2 lines Initialize the type object so pychecker can't crash the interpreter. ........ r46909 | neal.norwitz | 2006-06-13 10:41:06 +0200 (Tue, 13 Jun 2006) | 1 line Verify the crash due to EncodingMap not initialized does not return ........ r46910 | thomas.heller | 2006-06-13 10:56:14 +0200 (Tue, 13 Jun 2006) | 3 lines Add some windows datatypes that were missing from this file, and add the aliases defined in windows header files for the structures. ........ r46911 | thomas.heller | 2006-06-13 11:40:14 +0200 (Tue, 13 Jun 2006) | 3 lines Add back WCHAR, UINT, DOUBLE, _LARGE_INTEGER, _ULARGE_INTEGER. VARIANT_BOOL is a special _ctypes data type, not c_short. ........ r46912 | ronald.oussoren | 2006-06-13 13:19:56 +0200 (Tue, 13 Jun 2006) | 4 lines Linecache contains support for PEP302 loaders, but fails to deal with loaders that return None to indicate that the module is valid but no source is available. This patch fixes that. ........ r46913 | andrew.kuchling | 2006-06-13 13:57:04 +0200 (Tue, 13 Jun 2006) | 1 line Mention uuid module ........ r46915 | walter.doerwald | 2006-06-13 14:02:12 +0200 (Tue, 13 Jun 2006) | 2 lines Fix passing errors to the encoder and decoder functions. ........ r46917 | walter.doerwald | 2006-06-13 14:04:43 +0200 (Tue, 13 Jun 2006) | 3 lines errors is an attribute in the incremental decoder not an argument. ........ r46919 | andrew.macintyre | 2006-06-13 17:04:24 +0200 (Tue, 13 Jun 2006) | 11 lines Patch #1454481: Make thread stack size runtime tunable. Heavily revised, comprising revisions: 46640 - original trunk revision (backed out in r46655) 46647 - markup fix (backed out in r46655) 46692:46918 merged from branch aimacintyre-sf1454481 branch tested on buildbots (Windows buildbots had problems not related to these changes). ........ r46920 | brett.cannon | 2006-06-13 18:06:55 +0200 (Tue, 13 Jun 2006) | 2 lines Remove unused variable. ........ r46921 | andrew.kuchling | 2006-06-13 18:41:41 +0200 (Tue, 13 Jun 2006) | 1 line Add ability to set stack size ........ r46923 | marc-andre.lemburg | 2006-06-13 19:04:26 +0200 (Tue, 13 Jun 2006) | 2 lines Update pybench to version 2.0. ........ r46924 | marc-andre.lemburg | 2006-06-13 19:07:14 +0200 (Tue, 13 Jun 2006) | 2 lines Revert wrong svn copy. ........ r46925 | andrew.macintyre | 2006-06-13 19:14:36 +0200 (Tue, 13 Jun 2006) | 2 lines fix exception usage ........ r46927 | tim.peters | 2006-06-13 20:37:07 +0200 (Tue, 13 Jun 2006) | 2 lines Whitespace normalization. ........ r46928 | marc-andre.lemburg | 2006-06-13 20:56:56 +0200 (Tue, 13 Jun 2006) | 9 lines Updated to pybench 2.0. See svn.python.org/external/pybench-2.0 for the original import of that version. Note that platform.py was not copied over from pybench-2.0 since it is already part of Python 2.5. ........ r46929 | andrew.macintyre | 2006-06-13 21:02:35 +0200 (Tue, 13 Jun 2006) | 5 lines Increase the small thread stack size to get the test to pass reliably on the one buildbot that insists on more than 32kB of thread stack. ........ r46930 | marc-andre.lemburg | 2006-06-13 21:20:07 +0200 (Tue, 13 Jun 2006) | 2 lines Whitespace normalization. ........ r46931 | thomas.heller | 2006-06-13 22:18:43 +0200 (Tue, 13 Jun 2006) | 2 lines More docs for ctypes. ........ r46932 | brett.cannon | 2006-06-13 23:34:24 +0200 (Tue, 13 Jun 2006) | 2 lines Ignore .pyc and .pyo files in Pybench. ........ r46933 | brett.cannon | 2006-06-13 23:46:41 +0200 (Tue, 13 Jun 2006) | 7 lines If a classic class defined a __coerce__() method that just returned its two arguments in reverse, the interpreter would infinitely recourse trying to get a coercion that worked. So put in a recursion check after a coercion is made and the next call to attempt to use the coerced values. Fixes bug #992017 and closes crashers/coerce.py . ........ r46936 | gerhard.haering | 2006-06-14 00:24:47 +0200 (Wed, 14 Jun 2006) | 3 lines Merged changes from external pysqlite 2.3.0 release. Documentation updates will follow in a few hours at the latest. Then we should be ready for beta1. ........ r46937 | brett.cannon | 2006-06-14 00:26:13 +0200 (Wed, 14 Jun 2006) | 2 lines Missed test for rev. 46933; infinite recursion from __coerce__() returning its arguments reversed. ........ r46938 | gerhard.haering | 2006-06-14 00:53:48 +0200 (Wed, 14 Jun 2006) | 2 lines Updated documentation for pysqlite 2.3.0 API. ........ r46939 | tim.peters | 2006-06-14 06:09:25 +0200 (Wed, 14 Jun 2006) | 10 lines SequenceMatcher.get_matching_blocks(): This now guarantees that adjacent triples in the result list describe non-adjacent matching blocks. That's _nice_ to have, and Guido said he wanted it. Not a bugfix candidate: Guido or not ;-), this changes visible endcase semantics (note that some tests had to change), and nothing about this was documented before. Since it was working as designed, and behavior was consistent with the docs, it wasn't "a bug". ........ r46940 | tim.peters | 2006-06-14 06:13:00 +0200 (Wed, 14 Jun 2006) | 2 lines Repaired typo in new comment. ........ r46941 | tim.peters | 2006-06-14 06:15:27 +0200 (Wed, 14 Jun 2006) | 2 lines Whitespace normalization. ........ r46942 | fred.drake | 2006-06-14 06:25:02 +0200 (Wed, 14 Jun 2006) | 3 lines - make some disabled tests run what they intend when enabled - remove some over-zealous triple-quoting ........ r46943 | fred.drake | 2006-06-14 07:04:47 +0200 (Wed, 14 Jun 2006) | 3 lines add tests for two cases that are handled correctly in the current code, but that SF patch 1504676 as written mis-handles ........ r46944 | fred.drake | 2006-06-14 07:15:51 +0200 (Wed, 14 Jun 2006) | 1 line explain an XXX in more detail ........ r46945 | martin.v.loewis | 2006-06-14 07:21:04 +0200 (Wed, 14 Jun 2006) | 1 line Patch #1455898: Incremental mode for "mbcs" codec. ........ r46946 | georg.brandl | 2006-06-14 08:08:31 +0200 (Wed, 14 Jun 2006) | 3 lines Bug #1339007: Shelf objects now don't raise an exception in their __del__ method when initialization failed. ........ r46948 | thomas.heller | 2006-06-14 08:18:15 +0200 (Wed, 14 Jun 2006) | 1 line Fix docstring. ........ r46949 | georg.brandl | 2006-06-14 08:29:07 +0200 (Wed, 14 Jun 2006) | 2 lines Bug #1501122: mention __gt__ &co in description of comparison order. ........ r46951 | thomas.heller | 2006-06-14 09:08:38 +0200 (Wed, 14 Jun 2006) | 1 line Write more docs. ........ r46952 | georg.brandl | 2006-06-14 10:31:39 +0200 (Wed, 14 Jun 2006) | 3 lines Bug #1153163: describe __add__ vs __radd__ behavior when adding objects of same type/of subclasses of the other. ........ r46954 | georg.brandl | 2006-06-14 10:42:11 +0200 (Wed, 14 Jun 2006) | 3 lines Bug #1202018: add some common mime.types locations. ........ r46955 | georg.brandl | 2006-06-14 10:50:03 +0200 (Wed, 14 Jun 2006) | 3 lines Bug #1117556: SimpleHTTPServer now tries to find and use the system's mime.types file for determining MIME types. ........ r46957 | thomas.heller | 2006-06-14 11:09:08 +0200 (Wed, 14 Jun 2006) | 1 line Document paramflags. ........ r46958 | thomas.heller | 2006-06-14 11:20:11 +0200 (Wed, 14 Jun 2006) | 1 line Add an __all__ list, since this module does 'from ctypes import *'. ........ r46959 | andrew.kuchling | 2006-06-14 15:59:15 +0200 (Wed, 14 Jun 2006) | 1 line Add item ........ r46961 | georg.brandl | 2006-06-14 18:46:43 +0200 (Wed, 14 Jun 2006) | 3 lines Bug #805015: doc error in PyUnicode_FromEncodedObject. ........ r46962 | gerhard.haering | 2006-06-15 00:28:37 +0200 (Thu, 15 Jun 2006) | 10 lines - Added version checks in C code to make sure we don't trigger bugs in older SQLite versions. - Added version checks in test suite so that we don't execute tests that we know will fail with older (buggy) SQLite versions. Now, all tests should run against all SQLite versions from 3.0.8 until 3.3.6 (latest one now). The sqlite3 module can be built against all these SQLite versions and the sqlite3 module does its best to not trigger bugs in SQLite, but using SQLite 3.3.3 or later is recommended. ........ r46963 | tim.peters | 2006-06-15 00:38:13 +0200 (Thu, 15 Jun 2006) | 2 lines Whitespace normalization. ........ r46964 | neal.norwitz | 2006-06-15 06:54:29 +0200 (Thu, 15 Jun 2006) | 9 lines Speculative checkin (requires approval of Gerhard Haering) This backs out the test changes in 46962 which prevented crashes by not running the tests via a version check. All the version checks added in that rev were removed from the tests. Code was added to the error handler in connection.c that seems to work with older versions of sqlite including 3.1.3. ........ r46965 | neal.norwitz | 2006-06-15 07:55:49 +0200 (Thu, 15 Jun 2006) | 1 line Try to narrow window of failure on slow/busy boxes (ppc64 buildbot) ........ r46966 | martin.v.loewis | 2006-06-15 08:45:05 +0200 (Thu, 15 Jun 2006) | 2 lines Make import/lookup of mbcs fail on non-Windows systems. ........ r46967 | ronald.oussoren | 2006-06-15 10:14:18 +0200 (Thu, 15 Jun 2006) | 2 lines Patch #1446489 (zipfile: support for ZIP64) ........ r46968 | neal.norwitz | 2006-06-15 10:16:44 +0200 (Thu, 15 Jun 2006) | 6 lines Re-revert this change. Install the version check and don't run the test until Gerhard has time to fully debug the issue. This affects versions before 3.2.1 (possibly only versions earlier than 3.1.3). Based on discussion on python-checkins. ........ r46969 | gregory.p.smith | 2006-06-15 10:52:32 +0200 (Thu, 15 Jun 2006) | 6 lines - bsddb: multithreaded DB access using the simple bsddb module interface now works reliably. It has been updated to use automatic BerkeleyDB deadlock detection and the bsddb.dbutils.DeadlockWrap wrapper to retry database calls that would previously deadlock. [SF python bug #775414] ........ r46970 | gregory.p.smith | 2006-06-15 11:23:52 +0200 (Thu, 15 Jun 2006) | 2 lines minor documentation cleanup. mention the bsddb.db interface explicitly by name. ........ r46971 | neal.norwitz | 2006-06-15 11:57:03 +0200 (Thu, 15 Jun 2006) | 5 lines Steal the trick from test_compiler to print out a slow msg. This will hopefully get the buildbots to pass. Not sure this test will be feasible or even work. But everything is red now, so it can't get much worse. ........ r46972 | neal.norwitz | 2006-06-15 12:24:49 +0200 (Thu, 15 Jun 2006) | 1 line Print some more info to get an idea of how much longer the test will last ........ r46981 | tim.peters | 2006-06-15 20:04:40 +0200 (Thu, 15 Jun 2006) | 6 lines Try to reduce the extreme peak memory and disk-space use of this test. It probably still requires more disk space than most buildbots have, and in any case is still so intrusive that if we don't find another way to test this I'm taking my buildbot offline permanently ;-) ........ r46982 | tim.peters | 2006-06-15 20:06:29 +0200 (Thu, 15 Jun 2006) | 2 lines Whitespace normalization. ........ r46983 | tim.peters | 2006-06-15 20:07:28 +0200 (Thu, 15 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46984 | tim.peters | 2006-06-15 20:38:19 +0200 (Thu, 15 Jun 2006) | 2 lines Oops -- I introduced an off-by-6436159488 error. ........ r46990 | neal.norwitz | 2006-06-16 06:30:34 +0200 (Fri, 16 Jun 2006) | 1 line Disable this test until we can determine what to do about it ........ r46991 | neal.norwitz | 2006-06-16 06:31:06 +0200 (Fri, 16 Jun 2006) | 1 line Param name is dir, not directory. Update docstring. Backport candidate ........ r46992 | neal.norwitz | 2006-06-16 06:31:28 +0200 (Fri, 16 Jun 2006) | 1 line Add missing period in comment. ........ r46993 | neal.norwitz | 2006-06-16 06:32:43 +0200 (Fri, 16 Jun 2006) | 1 line Fix whitespace, there are memory leaks in this module. ........ r46995 | fred.drake | 2006-06-17 01:45:06 +0200 (Sat, 17 Jun 2006) | 3 lines SF patch 1504676: Make sgmllib char and entity references pluggable (implementation/tests contributed by Sam Ruby) ........ r46996 | fred.drake | 2006-06-17 03:07:54 +0200 (Sat, 17 Jun 2006) | 1 line fix change that broke the htmllib tests ........ r46998 | martin.v.loewis | 2006-06-17 11:15:14 +0200 (Sat, 17 Jun 2006) | 3 lines Patch #763580: Add name and value arguments to Tkinter variable classes. ........ r46999 | martin.v.loewis | 2006-06-17 11:20:41 +0200 (Sat, 17 Jun 2006) | 2 lines Patch #1096231: Add default argument to wm_iconbitmap. ........ r47000 | martin.v.loewis | 2006-06-17 11:25:15 +0200 (Sat, 17 Jun 2006) | 2 lines Patch #1494750: Destroy master after deleting children. ........ r47003 | george.yoshida | 2006-06-17 18:31:52 +0200 (Sat, 17 Jun 2006) | 2 lines markup fix ........ r47005 | george.yoshida | 2006-06-17 18:39:13 +0200 (Sat, 17 Jun 2006) | 4 lines Update url. Old url returned status code:301 Moved permanently. ........ r47007 | martin.v.loewis | 2006-06-17 20:44:27 +0200 (Sat, 17 Jun 2006) | 2 lines Patch #812986: Update the canvas even if not tracing. ........ r47008 | martin.v.loewis | 2006-06-17 21:03:26 +0200 (Sat, 17 Jun 2006) | 2 lines Patch #815924: Restore ability to pass type= and icon= ........ r47009 | neal.norwitz | 2006-06-18 00:37:45 +0200 (Sun, 18 Jun 2006) | 1 line Fix typo in docstring ........ r47010 | neal.norwitz | 2006-06-18 00:38:15 +0200 (Sun, 18 Jun 2006) | 1 line Fix memory leak reported by valgrind while running test_subprocess ........ r47011 | fred.drake | 2006-06-18 04:57:35 +0200 (Sun, 18 Jun 2006) | 1 line remove unnecessary markup ........ r47013 | neal.norwitz | 2006-06-18 21:35:01 +0200 (Sun, 18 Jun 2006) | 7 lines Prevent spurious leaks when running regrtest.py -R. There may be more issues that crop up from time to time, but this change seems to have been pretty stable (no spurious warnings) for about a week. Other modules which use threads may require similar use of threading_setup/threading_cleanup from test_support. ........ r47014 | neal.norwitz | 2006-06-18 21:37:40 +0200 (Sun, 18 Jun 2006) | 9 lines The hppa ubuntu box sometimes hangs forever in these tests. My guess is that the wait is failing for some reason. Use WNOHANG, so we won't wait until the buildbot kills the test suite. I haven't been able to reproduce the failure, so I'm not sure if this will help or not. Hopefully, this change will cause the test to fail, rather than hang. That will be better since we will get the rest of the test results. It may also help us debug the real problem. ........ r47015 | neal.norwitz | 2006-06-18 22:10:24 +0200 (Sun, 18 Jun 2006) | 1 line Revert 47014 until it is more robust ........ r47016 | thomas.heller | 2006-06-18 23:27:04 +0200 (Sun, 18 Jun 2006) | 6 lines Fix typos. Fix doctest example. Mention in the tutorial that 'errcheck' is explained in the ref manual. Use better wording in some places. Remoce code examples that shouldn't be in the tutorial. Remove some XXX notices. ........ r47017 | georg.brandl | 2006-06-19 00:17:29 +0200 (Mon, 19 Jun 2006) | 3 lines Patch #1507676: improve exception messages in abstract.c, object.c and typeobject.c. ........ r47018 | neal.norwitz | 2006-06-19 07:40:44 +0200 (Mon, 19 Jun 2006) | 1 line Use Py_ssize_t ........ r47019 | georg.brandl | 2006-06-19 08:35:54 +0200 (Mon, 19 Jun 2006) | 3 lines Add news entry about error msg improvement. ........ r47020 | thomas.heller | 2006-06-19 09:07:49 +0200 (Mon, 19 Jun 2006) | 2 lines Try to repair the failing test on the OpenBSD buildbot. Trial and error... ........ r47021 | tim.peters | 2006-06-19 09:45:16 +0200 (Mon, 19 Jun 2006) | 2 lines Whitespace normalization. ........ r47022 | walter.doerwald | 2006-06-19 10:07:50 +0200 (Mon, 19 Jun 2006) | 4 lines Patch #1506645: add Python wrappers for the curses functions is_term_resized, resize_term and resizeterm. This uses three separate configure checks (one for each function). ........ r47023 | walter.doerwald | 2006-06-19 10:14:09 +0200 (Mon, 19 Jun 2006) | 2 lines Make check order match in configure and configure.in. ........ r47024 | tim.peters | 2006-06-19 10:14:28 +0200 (Mon, 19 Jun 2006) | 3 lines Repair KeyError when running test_threaded_import under -R, as reported by Neal on python-dev. ........ r47025 | thomas.heller | 2006-06-19 10:32:46 +0200 (Mon, 19 Jun 2006) | 3 lines Next try to fix the OpenBSD buildbot tests: Use ctypes.util.find_library to locate the C runtime library on platforms where is returns useful results. ........ r47026 | tim.peters | 2006-06-19 11:09:44 +0200 (Mon, 19 Jun 2006) | 13 lines TestHelp.make_parser(): This was making a permanent change to os.environ (setting envar COLUMNS), which at least caused test_float_default() to fail if the tests were run more than once. This repairs the test_optparse -R failures Neal reported on python-dev. It also explains some seemingly bizarre test_optparse failures we saw a couple weeks ago on the buildbots, when test_optparse failed due to test_file failing to clean up after itself, and then test_optparse failed in an entirely different way when regrtest's -w option ran test_optparse a second time. It's now obvious that make_parser() permanently changing os.environ was responsible for the second half of that. ........ r47027 | anthony.baxter | 2006-06-19 14:04:15 +0200 (Mon, 19 Jun 2006) | 2 lines Preparing for 2.5b1. ........ r47029 | fred.drake | 2006-06-19 19:31:16 +0200 (Mon, 19 Jun 2006) | 1 line remove non-working document formats from edist ........ r47030 | gerhard.haering | 2006-06-19 23:17:35 +0200 (Mon, 19 Jun 2006) | 5 lines Fixed a memory leak that was introduced with incorrect usage of the Python weak reference API in pysqlite 2.2.1. Bumbed pysqlite version number to upcoming pysqlite 2.3.1 release. ........ r47032 | ka-ping.yee | 2006-06-20 00:49:36 +0200 (Tue, 20 Jun 2006) | 2 lines Remove Python 2.3 compatibility comment. ........ r47033 | trent.mick | 2006-06-20 01:21:25 +0200 (Tue, 20 Jun 2006) | 2 lines Upgrade pyexpat to expat 2.0.0 (http://python.org/sf/1462338). ........ r47034 | trent.mick | 2006-06-20 01:57:41 +0200 (Tue, 20 Jun 2006) | 3 lines [ 1295808 ] expat symbols should be namespaced in pyexpat (http://python.org/sf/1295808) ........ r47039 | andrew.kuchling | 2006-06-20 13:52:16 +0200 (Tue, 20 Jun 2006) | 1 line Uncomment wsgiref section ........ r47040 | andrew.kuchling | 2006-06-20 14:15:09 +0200 (Tue, 20 Jun 2006) | 1 line Add four library items ........ r47041 | andrew.kuchling | 2006-06-20 14:19:54 +0200 (Tue, 20 Jun 2006) | 1 line Terminology and typography fixes ........ r47042 | andrew.kuchling | 2006-06-20 15:05:12 +0200 (Tue, 20 Jun 2006) | 1 line Add introductory paragraphs summarizing the release; minor edits ........ r47043 | andrew.kuchling | 2006-06-20 15:11:29 +0200 (Tue, 20 Jun 2006) | 1 line Minor edits and rearrangements; markup fix ........ r47044 | andrew.kuchling | 2006-06-20 15:20:30 +0200 (Tue, 20 Jun 2006) | 1 line [Bug #1504456] Mention xml -> xmlcore change ........ r47047 | brett.cannon | 2006-06-20 19:30:26 +0200 (Tue, 20 Jun 2006) | 2 lines Raise TestSkipped when the test socket connection is refused. ........ r47049 | brett.cannon | 2006-06-20 21:20:17 +0200 (Tue, 20 Jun 2006) | 2 lines Fix typo of exception name. ........ r47053 | brett.cannon | 2006-06-21 18:57:57 +0200 (Wed, 21 Jun 2006) | 5 lines At the C level, tuple arguments are passed in directly to the exception constructor, meaning it is treated as *args, not as a single argument. This means using the 'message' attribute won't work (until Py3K comes around), and so one must grab from 'arg' to get the error number. ........ r47054 | andrew.kuchling | 2006-06-21 19:10:18 +0200 (Wed, 21 Jun 2006) | 1 line Link to LibRef module documentation ........ r47055 | andrew.kuchling | 2006-06-21 19:17:10 +0200 (Wed, 21 Jun 2006) | 1 line Note some of Barry's work ........ r47056 | andrew.kuchling | 2006-06-21 19:17:28 +0200 (Wed, 21 Jun 2006) | 1 line Bump version ........ r47057 | georg.brandl | 2006-06-21 19:45:17 +0200 (Wed, 21 Jun 2006) | 3 lines fix [ 1509132 ] compiler module builds incorrect AST for TryExceptFinally ........ r47058 | georg.brandl | 2006-06-21 19:52:36 +0200 (Wed, 21 Jun 2006) | 3 lines Make test_fcntl aware of netbsd3. ........ r47059 | georg.brandl | 2006-06-21 19:53:17 +0200 (Wed, 21 Jun 2006) | 3 lines Patch #1509001: expected skips for netbsd3. ........ r47060 | gerhard.haering | 2006-06-21 22:55:04 +0200 (Wed, 21 Jun 2006) | 2 lines Removed call to enable_callback_tracebacks that slipped in by accident. ........ r47061 | armin.rigo | 2006-06-21 23:58:50 +0200 (Wed, 21 Jun 2006) | 13 lines Fix for an obscure bug introduced by revs 46806 and 46808, with a test. The problem of checking too eagerly for recursive calls is the following: if a RuntimeError is caused by recursion, and if code needs to normalize it immediately (as in the 2nd test), then PyErr_NormalizeException() needs a call to the RuntimeError class to instantiate it, and this hits the recursion limit again... causing PyErr_NormalizeException() to never finish. Moved this particular recursion check to slot_tp_call(), which is not involved in instantiating built-in exceptions. Backport candidate. ........ r47064 | neal.norwitz | 2006-06-22 08:30:50 +0200 (Thu, 22 Jun 2006) | 3 lines Copy the wsgiref package during make install. ........ r47065 | neal.norwitz | 2006-06-22 08:35:30 +0200 (Thu, 22 Jun 2006) | 1 line Reset the doc date to today for the automatic doc builds ........ r47067 | andrew.kuchling | 2006-06-22 15:10:23 +0200 (Thu, 22 Jun 2006) | 1 line Mention how to suppress warnings ........ r47069 | georg.brandl | 2006-06-22 16:46:17 +0200 (Thu, 22 Jun 2006) | 3 lines Set lineno correctly on list, tuple and dict literals. ........ r47070 | georg.brandl | 2006-06-22 16:46:46 +0200 (Thu, 22 Jun 2006) | 4 lines Test for correct compilation of try-except-finally stmt. Test for correct lineno on list, tuple, dict literals. ........ r47071 | fred.drake | 2006-06-22 17:50:08 +0200 (Thu, 22 Jun 2006) | 1 line fix markup nit ........ r47072 | brett.cannon | 2006-06-22 18:49:14 +0200 (Thu, 22 Jun 2006) | 6 lines 'warning's was improperly requiring that a command-line Warning category be both a subclass of Warning and a subclass of types.ClassType. The latter is no longer true thanks to new-style exceptions. Closes bug #1510580. Thanks to AMK for the test. ........ r47073 | ronald.oussoren | 2006-06-22 20:33:54 +0200 (Thu, 22 Jun 2006) | 3 lines MacOSX: Add a message to the first screen of the installer that tells users how to avoid updates to their shell profile. ........ r47074 | georg.brandl | 2006-06-22 21:02:18 +0200 (Thu, 22 Jun 2006) | 3 lines Fix my name ;) ........ r47075 | thomas.heller | 2006-06-22 21:07:36 +0200 (Thu, 22 Jun 2006) | 2 lines Small fixes, mostly in the markup. ........ r47076 | peter.astrand | 2006-06-22 22:06:46 +0200 (Thu, 22 Jun 2006) | 1 line Make it possible to run test_subprocess.py on Python 2.2, which lacks test_support.is_resource_enabled. ........ r47077 | peter.astrand | 2006-06-22 22:21:26 +0200 (Thu, 22 Jun 2006) | 1 line Applied patch #1506758: Prevent MemoryErrors with large MAXFD. ........ r47079 | neal.norwitz | 2006-06-23 05:32:44 +0200 (Fri, 23 Jun 2006) | 1 line Fix refleak ........ r47080 | fred.drake | 2006-06-23 08:03:45 +0200 (Fri, 23 Jun 2006) | 9 lines - SF bug #853506: IP6 address parsing in sgmllib ('[' and ']' were not accepted in unquoted attribute values) - cleaned up tests of character and entity reference decoding so the tests cover the documented relationships among handle_charref, handle_entityref, convert_charref, convert_codepoint, and convert_entityref, without bringing up Unicode issues that sgmllib cannot be involved in ........ r47085 | andrew.kuchling | 2006-06-23 21:23:40 +0200 (Fri, 23 Jun 2006) | 11 lines Fit Makefile for the Python doc environment better; this is a step toward including the howtos in the build process. * Put LaTeX output in ../paper-<whatever>/. * Put HTML output in ../html/ * Explain some of the Makefile variables * Remove some cruft dating to my environment (e.g. the 'web' target) This makefile isn't currently invoked by the documentation build process, so these changes won't destabilize anything. ........ r47086 | hyeshik.chang | 2006-06-23 23:16:18 +0200 (Fri, 23 Jun 2006) | 5 lines Bug #1511381: codec_getstreamcodec() in codec.c is corrected to omit a default "error" argument for NULL pointer. This allows the parser to take a codec from cjkcodecs again. (Reported by Taewook Kang and reviewed by Walter Doerwald) ........ r47091 | ronald.oussoren | 2006-06-25 22:44:16 +0200 (Sun, 25 Jun 2006) | 6 lines Workaround for bug #1512124 Without this patch IDLE will get unresponsive when you open the debugger window on OSX. This is both using the system Tcl/Tk on Tiger as the latest universal download from tk-components.sf.net. ........ r47092 | ronald.oussoren | 2006-06-25 23:14:19 +0200 (Sun, 25 Jun 2006) | 3 lines Drop the calldll demo's for macos, calldll isn't present anymore, no need to keep the demo's around. ........ r47093 | ronald.oussoren | 2006-06-25 23:15:58 +0200 (Sun, 25 Jun 2006) | 3 lines Use a path without a double slash to compile the .py files after installation (macosx, binary installer). This fixes bug #1508369 for python 2.5. ........ r47094 | ronald.oussoren | 2006-06-25 23:19:06 +0200 (Sun, 25 Jun 2006) | 3 lines Also install the .egg-info files in Lib. This will cause wsgiref.egg-info to be installed. ........ r47097 | andrew.kuchling | 2006-06-26 14:40:02 +0200 (Mon, 26 Jun 2006) | 1 line [Bug #1511998] Various comments from Nick Coghlan; thanks! ........ r47098 | andrew.kuchling | 2006-06-26 14:43:43 +0200 (Mon, 26 Jun 2006) | 1 line Describe workaround for PyRange_New()'s removal ........ r47099 | andrew.kuchling | 2006-06-26 15:08:24 +0200 (Mon, 26 Jun 2006) | 5 lines [Bug #1512163] Fix typo. This change will probably break tests on FreeBSD buildbots, but I'll check in a fix for that next. ........ r47100 | andrew.kuchling | 2006-06-26 15:12:16 +0200 (Mon, 26 Jun 2006) | 9 lines [Bug #1512163] Use one set of locking methods, lockf(); remove the flock() calls. On FreeBSD, the two methods lockf() and flock() end up using the same mechanism and the second one fails. A Linux man page claims that the two methods are orthogonal (so locks acquired one way don't interact with locks acquired the other way) but that clearly must be false. ........ r47101 | andrew.kuchling | 2006-06-26 15:23:10 +0200 (Mon, 26 Jun 2006) | 5 lines Add a test for a conflicting lock. On slow machines, maybe the time intervals (2 sec, 0.5 sec) will be too tight. I'll see how the buildbots like it. ........ r47103 | andrew.kuchling | 2006-06-26 16:33:24 +0200 (Mon, 26 Jun 2006) | 1 line Windows doesn't have os.fork(). I'll just disable this test for now ........ r47106 | andrew.kuchling | 2006-06-26 19:00:35 +0200 (Mon, 26 Jun 2006) | 9 lines Attempt to fix build failure on OS X and Debian alpha; the symptom is consistent with os.wait() returning immediately because some other subprocess had previously exited; the test suite then immediately tries to lock the mailbox and gets an error saying it's already locked. To fix this, do a waitpid() so the test suite only continues once the intended child process has exited. ........ r47113 | neal.norwitz | 2006-06-27 06:06:46 +0200 (Tue, 27 Jun 2006) | 1 line Ignore some more warnings in the dynamic linker on an older gentoo ........ r47114 | neal.norwitz | 2006-06-27 06:09:13 +0200 (Tue, 27 Jun 2006) | 6 lines Instead of doing a make test, run the regression tests out of the installed copy. This will hopefully catch problems where directories are added under Lib/ but not to Makefile.pre.in. This breaks out the 2 runs of the test suite with and without -O which is also nicer. ........ r47115 | neal.norwitz | 2006-06-27 06:12:58 +0200 (Tue, 27 Jun 2006) | 5 lines Fix SF bug #1513032, 'make install' failure on FreeBSD 5.3. No need to install lib-old, it's empty in 2.5. ........ r47116 | neal.norwitz | 2006-06-27 06:23:06 +0200 (Tue, 27 Jun 2006) | 1 line Test unimportant change to verify buildbot does not try to build ........ r47117 | neal.norwitz | 2006-06-27 06:26:30 +0200 (Tue, 27 Jun 2006) | 1 line Try again: test unimportant change to verify buildbot does not try to build ........ r47118 | neal.norwitz | 2006-06-27 06:28:56 +0200 (Tue, 27 Jun 2006) | 1 line Verify buildbot picks up these changes (really needs testing after last change to Makefile.pre.in) ........ r47121 | vinay.sajip | 2006-06-27 09:34:37 +0200 (Tue, 27 Jun 2006) | 1 line Removed buggy exception handling in doRollover of rotating file handlers. Exceptions now propagate to caller. ........ r47123 | ronald.oussoren | 2006-06-27 12:08:25 +0200 (Tue, 27 Jun 2006) | 3 lines MacOSX: fix rather dumb buglet that made it impossible to create extensions on OSX 10.3 when using a binary distribution build on 10.4. ........ r47125 | tim.peters | 2006-06-27 13:52:49 +0200 (Tue, 27 Jun 2006) | 2 lines Whitespace normalization. ........ r47128 | ronald.oussoren | 2006-06-27 14:53:52 +0200 (Tue, 27 Jun 2006) | 8 lines Use staticly build copies of zlib and bzip2 to build the OSX installer, that way the resulting binaries have a better change of running on 10.3. This patch also updates the search logic for sleepycat db3/4, without this patch you cannot use a sleepycat build with a non-standard prefix; with this you can (at least on OSX) if you add the prefix to CPPFLAGS/LDFLAGS at configure-time. This change is needed to build the binary installer for OSX. ........ r47131 | ronald.oussoren | 2006-06-27 17:45:32 +0200 (Tue, 27 Jun 2006) | 5 lines macosx: Install a libpython2.5.a inside the framework as a symlink to the actual dylib at the root of the framework, that way tools that expect a unix-like install (python-config, but more importantly external products like mod_python) work correctly. ........ r47137 | neal.norwitz | 2006-06-28 07:03:22 +0200 (Wed, 28 Jun 2006) | 4 lines According to the man pages on Gentoo Linux and Tru64, EACCES or EAGAIN can be returned if fcntl (lockf) fails. This fixes the test failure on Tru64 by checking for either error rather than just EAGAIN. ........ r47139 | neal.norwitz | 2006-06-28 08:28:31 +0200 (Wed, 28 Jun 2006) | 5 lines Fix bug #1512695: cPickle.loads could crash if it was interrupted with a KeyboardInterrupt since PyTuple_Pack was passed a NULL. Will backport. ........ r47142 | nick.coghlan | 2006-06-28 12:41:47 +0200 (Wed, 28 Jun 2006) | 1 line Make full module name available as __module_name__ even when __name__ is set to something else (like '__main__') ........ r47143 | armin.rigo | 2006-06-28 12:49:51 +0200 (Wed, 28 Jun 2006) | 2 lines A couple of crashers of the "won't fix" kind. ........ r47147 | andrew.kuchling | 2006-06-28 16:25:20 +0200 (Wed, 28 Jun 2006) | 1 line [Bug #1508766] Add docs for uuid module; docs written by George Yoshida, with minor rearrangements by me. ........ r47148 | andrew.kuchling | 2006-06-28 16:27:21 +0200 (Wed, 28 Jun 2006) | 1 line [Bug #1508766] Add docs for uuid module; this puts the module in the 'Internet Protocols' section. Arguably this module could also have gone in the chapters on strings or encodings, maybe even the crypto chapter. Fred, please move if you see fit. ........ r47151 | georg.brandl | 2006-06-28 22:23:25 +0200 (Wed, 28 Jun 2006) | 3 lines Fix end_fill(). ........ r47153 | trent.mick | 2006-06-28 22:30:41 +0200 (Wed, 28 Jun 2006) | 2 lines Mention the expat upgrade and pyexpat fix I put in 2.5b1. ........ r47154 | fred.drake | 2006-06-29 02:51:53 +0200 (Thu, 29 Jun 2006) | 6 lines SF bug #1504333: sgmlib should allow angle brackets in quoted values (modified patch by Sam Ruby; changed to use separate REs for start and end tags to reduce matching cost for end tags; extended tests; updated to avoid breaking previous changes to support IPv6 addresses in unquoted attribute values) ........ r47156 | fred.drake | 2006-06-29 04:57:48 +0200 (Thu, 29 Jun 2006) | 1 line document recent bugfixes in sgmllib ........ r47158 | neal.norwitz | 2006-06-29 06:10:08 +0200 (Thu, 29 Jun 2006) | 10 lines Add new utility function, reap_children(), to test_support. This should be called at the end of each test that spawns children (perhaps it should be called from regrtest instead?). This will hopefully prevent some of the unexplained failures in the buildbots (hppa and alpha) during tests that spawn children. The problems were not reproducible. There were many zombies that remained at the end of several tests. In the worst case, this shouldn't cause any more problems, though it may not help either. Time will tell. ........ r47159 | neal.norwitz | 2006-06-29 07:48:14 +0200 (Thu, 29 Jun 2006) | 5 lines This should fix the buildbot failure on s/390 which can't connect to gmail.org. It makes the error message consistent and always sends to stderr. It would be much better for all the networking tests to hit only python.org. ........ r47161 | thomas.heller | 2006-06-29 20:34:15 +0200 (Thu, 29 Jun 2006) | 3 lines Protect the thread api calls in the _ctypes extension module within #ifdef WITH_THREADS/#endif blocks. Found by Sam Rushing. ........ r47162 | martin.v.loewis | 2006-06-29 20:58:44 +0200 (Thu, 29 Jun 2006) | 2 lines Patch #1509163: MS Toolkit Compiler no longer available ........ r47163 | skip.montanaro | 2006-06-29 21:20:09 +0200 (Thu, 29 Jun 2006) | 1 line add string methods to index ........ r47164 | vinay.sajip | 2006-06-30 02:13:08 +0200 (Fri, 30 Jun 2006) | 1 line Fixed bug in fileConfig() which failed to clear logging._handlerList ........ r47166 | tim.peters | 2006-06-30 08:18:39 +0200 (Fri, 30 Jun 2006) | 2 lines Whitespace normalization. ........ r47170 | neal.norwitz | 2006-06-30 09:32:16 +0200 (Fri, 30 Jun 2006) | 1 line Silence compiler warning ........ r47171 | neal.norwitz | 2006-06-30 09:32:46 +0200 (Fri, 30 Jun 2006) | 1 line Another problem reported by Coverity. Backport candidate. ........ r47175 | thomas.heller | 2006-06-30 19:44:54 +0200 (Fri, 30 Jun 2006) | 2 lines Revert the use of PY_FORMAT_SIZE_T in PyErr_Format. ........ r47176 | tim.peters | 2006-06-30 20:34:51 +0200 (Fri, 30 Jun 2006) | 2 lines Remove now-unused fidding with PY_FORMAT_SIZE_T. ........ r47177 | georg.brandl | 2006-06-30 20:47:56 +0200 (Fri, 30 Jun 2006) | 3 lines Document decorator usage of property. ........ r47181 | fred.drake | 2006-06-30 21:29:25 +0200 (Fri, 30 Jun 2006) | 4 lines - consistency nit: always include "()" in \function and \method (*should* be done by the presentation, but that requires changes all over) - avoid spreading the __name meme ........ r47188 | vinay.sajip | 2006-07-01 12:45:20 +0200 (Sat, 01 Jul 2006) | 1 line Added entry for fileConfig() bugfix. ........ r47189 | vinay.sajip | 2006-07-01 12:47:20 +0200 (Sat, 01 Jul 2006) | 1 line Added duplicate call to fileConfig() to ensure that it cleans up after itself correctly. ........ r47190 | martin.v.loewis | 2006-07-01 17:33:37 +0200 (Sat, 01 Jul 2006) | 2 lines Release all forwarded functions in .close. Fixes #1513223. ........ r47191 | fred.drake | 2006-07-01 18:28:20 +0200 (Sat, 01 Jul 2006) | 7 lines SF bug #1296433 (Expat bug #1515266): Unchecked calls to character data handler would cause a segfault. This merges in Expat's lib/xmlparse.c revisions 1.154 and 1.155, which fix this and a closely related problem (the later does not affect Python). Moved the crasher test to the tests for xml.parsers.expat. ........ r47197 | gerhard.haering | 2006-07-02 19:48:30 +0200 (Sun, 02 Jul 2006) | 4 lines The sqlite3 module did cut off data from the SQLite database at the first null character before sending it to a custom converter. This has been fixed now. ........ r47198 | martin.v.loewis | 2006-07-02 20:44:00 +0200 (Sun, 02 Jul 2006) | 1 line Correct arithmetic in access on Win32. Fixes #1513646. ........ r47203 | thomas.heller | 2006-07-03 09:58:09 +0200 (Mon, 03 Jul 2006) | 1 line Cleanup: Remove commented out code. ........ r47204 | thomas.heller | 2006-07-03 09:59:50 +0200 (Mon, 03 Jul 2006) | 1 line Don't run the doctests with Python 2.3 because it doesn't have the ELLIPSIS flag. ........ r47205 | thomas.heller | 2006-07-03 10:04:05 +0200 (Mon, 03 Jul 2006) | 7 lines Fixes so that _ctypes can be compiled with the MingW compiler. It seems that the definition of '__attribute__(x)' was responsible for the compiler ignoring the '__fastcall' attribute on the ffi_closure_SYSV function in libffi_msvc/ffi.c, took me quite some time to figure this out. ........ r47206 | thomas.heller | 2006-07-03 10:08:14 +0200 (Mon, 03 Jul 2006) | 11 lines Add a new function uses_seh() to the _ctypes extension module. This will return True if Windows Structured Exception handling (SEH) is used when calling functions, False otherwise. Currently, only MSVC supports SEH. Fix the test so that it doesn't crash when run with MingW compiled _ctypes. Note that two tests are still failing when mingw is used, I suspect structure layout differences and function calling conventions between MSVC and MingW. ........ r47207 | tim.peters | 2006-07-03 10:23:19 +0200 (Mon, 03 Jul 2006) | 2 lines Whitespace normalization. ........ r47208 | martin.v.loewis | 2006-07-03 11:44:00 +0200 (Mon, 03 Jul 2006) | 3 lines Only setup canvas when it is first created. Fixes #1514703 ........ r47209 | martin.v.loewis | 2006-07-03 12:05:30 +0200 (Mon, 03 Jul 2006) | 3 lines Reimplement turtle.circle using a polyline, to allow correct filling of arcs. Also fixes #1514693. ........ r47210 | martin.v.loewis | 2006-07-03 12:19:49 +0200 (Mon, 03 Jul 2006) | 3 lines Bug #1514693: Update turtle's heading when switching between degrees and radians. ........ r47211 | martin.v.loewis | 2006-07-03 13:12:06 +0200 (Mon, 03 Jul 2006) | 2 lines Document functions added in 2.3 and 2.5. ........ r47212 | martin.v.loewis | 2006-07-03 14:19:50 +0200 (Mon, 03 Jul 2006) | 3 lines Bug #1417699: Reject locale-specific decimal point in float() and atof(). ........ r47213 | martin.v.loewis | 2006-07-03 14:28:58 +0200 (Mon, 03 Jul 2006) | 3 lines Bug #1267547: Put proper recursive setup.py call into the spec file generated by bdist_rpm. ........ r47215 | martin.v.loewis | 2006-07-03 15:01:35 +0200 (Mon, 03 Jul 2006) | 3 lines Patch #825417: Fix timeout processing in expect, read_until. Will backport to 2.4. ........ r47218 | martin.v.loewis | 2006-07-03 15:47:40 +0200 (Mon, 03 Jul 2006) | 2 lines Put method-wrappers into trashcan. Fixes #927248. ........ r47219 | andrew.kuchling | 2006-07-03 16:07:30 +0200 (Mon, 03 Jul 2006) | 1 line [Bug #1515932] Clarify description of slice assignment ........ r47220 | andrew.kuchling | 2006-07-03 16:16:09 +0200 (Mon, 03 Jul 2006) | 4 lines [Bug #1511911] Clarify description of optional arguments to sorted() by improving the xref to the section on lists, and by copying the explanations of the arguments (with a slight modification). ........ r47223 | kristjan.jonsson | 2006-07-03 16:59:05 +0200 (Mon, 03 Jul 2006) | 1 line Fix build problems with the platform SDK on windows. It is not sufficient to test for the C compiler version when determining if we have the secure CRT from microsoft. Must test with an undocumented macro, __STDC_SECURE_LIB__ too. ........ r47224 | ronald.oussoren | 2006-07-04 14:30:22 +0200 (Tue, 04 Jul 2006) | 7 lines Sync the darwin/x86 port libffi with the copy in PyObjC. This fixes a number of bugs in that port. The most annoying ones were due to some subtle differences between the document ABI and the actual implementation :-( (there are no python unittests that fail without this patch, but without it some of libffi's unittests fail). ........ r47234 | georg.brandl | 2006-07-05 10:21:00 +0200 (Wed, 05 Jul 2006) | 3 lines Remove remaining references to OverflowWarning. ........ r47236 | thomas.heller | 2006-07-05 11:13:56 +0200 (Wed, 05 Jul 2006) | 3 lines Fix the bitfield test when _ctypes is compiled with MingW. Structures containing bitfields may have different layout on MSVC and MingW . ........ r47237 | thomas.wouters | 2006-07-05 13:03:49 +0200 (Wed, 05 Jul 2006) | 15 lines Fix bug in passing tuples to string.Template. All other values (with working str() or repr()) would work, just not multi-value tuples. Probably not a backport candidate, since it changes the behaviour of passing a single-element tuple: >>> string.Template("$foo").substitute(dict(foo=(1,))) '(1,)' versus '1' ........ r47241 | georg.brandl | 2006-07-05 16:18:45 +0200 (Wed, 05 Jul 2006) | 2 lines Patch #1517490: fix glitches in filter() docs. ........ r47244 | georg.brandl | 2006-07-05 17:50:05 +0200 (Wed, 05 Jul 2006) | 2 lines no need to elaborate "string". ........ r47251 | neal.norwitz | 2006-07-06 06:28:59 +0200 (Thu, 06 Jul 2006) | 3 lines Fix refleaks reported by Shane Hathaway in SF patch #1515361. This change contains only the changes related to leaking the copy variable. ........ r47253 | fred.drake | 2006-07-06 07:13:22 +0200 (Thu, 06 Jul 2006) | 4 lines - back out Expat change; the final fix to Expat will be different - change the pyexpat wrapper to not be so sensitive to this detail of the Expat implementation (the ex-crasher test still passes) ........ r47257 | neal.norwitz | 2006-07-06 08:45:08 +0200 (Thu, 06 Jul 2006) | 1 line Add a NEWS entry for a recent pyexpat fix ........ r47258 | martin.v.loewis | 2006-07-06 08:55:58 +0200 (Thu, 06 Jul 2006) | 2 lines Add sqlite3.dll to the DLLs component, not to the TkDLLs component. Fixes #1517388. ........ r47259 | martin.v.loewis | 2006-07-06 09:05:21 +0200 (Thu, 06 Jul 2006) | 1 line Properly quote compileall and Lib paths in case TARGETDIR has a space. ........ r47260 | thomas.heller | 2006-07-06 09:50:18 +0200 (Thu, 06 Jul 2006) | 5 lines Revert the change done in svn revision 47206: Add a new function uses_seh() to the _ctypes extension module. This will return True if Windows Structured Exception handling (SEH) is used when calling functions, False otherwise. ........ r47261 | armin.rigo | 2006-07-06 09:58:18 +0200 (Thu, 06 Jul 2006) | 3 lines A couple of examples about how to attack the fact that _PyType_Lookup() returns a borrowed ref. Many of the calls are open to attack. ........ r47262 | thomas.heller | 2006-07-06 10:28:14 +0200 (Thu, 06 Jul 2006) | 2 lines The test that calls a function with invalid arguments and catches the resulting Windows access violation will not be run by default. ........ r47263 | thomas.heller | 2006-07-06 10:48:35 +0200 (Thu, 06 Jul 2006) | 5 lines Patch #1517790: It is now possible to use custom objects in the ctypes foreign function argtypes sequence as long as they provide a from_param method, no longer is it required that the object is a ctypes type. ........ r47264 | thomas.heller | 2006-07-06 10:58:40 +0200 (Thu, 06 Jul 2006) | 2 lines Document the Struture and Union constructors. ........ r47265 | thomas.heller | 2006-07-06 11:11:22 +0200 (Thu, 06 Jul 2006) | 2 lines Document the changes in svn revision 47263, from patch #1517790. ........ r47267 | ronald.oussoren | 2006-07-06 12:13:35 +0200 (Thu, 06 Jul 2006) | 7 lines This patch solves the problem Skip was seeing with zlib, this patch ensures that configure uses similar compiler flags as setup.py when doing the zlib test. Without this patch configure would use the first shared library on the linker path, with this patch it uses the first shared or static library on that path just like setup.py. ........ r47268 | thomas.wouters | 2006-07-06 12:48:28 +0200 (Thu, 06 Jul 2006) | 4 lines NEWS entry for r47267: fixing configure's zlib probing. ........ r47269 | fredrik.lundh | 2006-07-06 14:29:24 +0200 (Thu, 06 Jul 2006) | 3 lines added XMLParser alias for cElementTree compatibility ........ r47271 | nick.coghlan | 2006-07-06 14:53:04 +0200 (Thu, 06 Jul 2006) | 1 line Revert the __module_name__ changes made in rev 47142. We'll revisit this in Python 2.6 ........ r47272 | nick.coghlan | 2006-07-06 15:04:56 +0200 (Thu, 06 Jul 2006) | 1 line Update the tutorial section on relative imports ........ r47273 | nick.coghlan | 2006-07-06 15:35:27 +0200 (Thu, 06 Jul 2006) | 1 line Ignore ImportWarning by default ........ r47274 | nick.coghlan | 2006-07-06 15:41:34 +0200 (Thu, 06 Jul 2006) | 1 line Cover ImportWarning, PendingDeprecationWarning and simplefilter() in the warnings module docs ........ r47275 | nick.coghlan | 2006-07-06 15:47:18 +0200 (Thu, 06 Jul 2006) | 1 line Add NEWS entries for the ImportWarning change and documentation update ........ r47276 | andrew.kuchling | 2006-07-06 15:57:28 +0200 (Thu, 06 Jul 2006) | 1 line ImportWarning is now silent by default ........ r47277 | thomas.heller | 2006-07-06 17:06:05 +0200 (Thu, 06 Jul 2006) | 2 lines Document the correct return type of PyLong_AsUnsignedLongLongMask. ........ r47278 | hyeshik.chang | 2006-07-06 17:21:52 +0200 (Thu, 06 Jul 2006) | 2 lines Add a testcase for r47086 which fixed a bug in codec_getstreamcodec(). ........ r47279 | hyeshik.chang | 2006-07-06 17:39:24 +0200 (Thu, 06 Jul 2006) | 3 lines Test using all CJK encodings for the testcases which don't require specific encodings. ........ r47280 | martin.v.loewis | 2006-07-06 21:28:03 +0200 (Thu, 06 Jul 2006) | 2 lines Properly generate logical file ids. Fixes #1515998. Also correct typo in Control.mapping. ........ r47287 | neal.norwitz | 2006-07-07 08:03:15 +0200 (Fri, 07 Jul 2006) | 17 lines Restore rev 47014: The hppa ubuntu box sometimes hangs forever in these tests. My guess is that the wait is failing for some reason. Use WNOHANG, so we won't wait until the buildbot kills the test suite. I haven't been able to reproduce the failure, so I'm not sure if this will help or not. Hopefully, this change will cause the test to fail, rather than hang. That will be better since we will get the rest of the test results. It may also help us debug the real problem. *** The reason this originally failed was because there were many zombie children outstanding before rev 47158 cleaned them up. There are still hangs in test_subprocess that need to be addressed, but that will take more work. This should close some holes. ........ r47289 | georg.brandl | 2006-07-07 10:15:12 +0200 (Fri, 07 Jul 2006) | 3 lines Fix RFC number. ........ r50489 | neal.norwitz | 2006-07-08 07:31:37 +0200 (Sat, 08 Jul 2006) | 1 line Fix SF bug #1519018: 'as' is now validated properly in import statements ........ r50490 | georg.brandl | 2006-07-08 14:15:27 +0200 (Sat, 08 Jul 2006) | 3 lines Add an additional test for bug #1519018. ........ r50491 | tim.peters | 2006-07-08 21:55:05 +0200 (Sat, 08 Jul 2006) | 2 lines Whitespace normalization. ........ r50493 | neil.schemenauer | 2006-07-09 18:16:34 +0200 (Sun, 09 Jul 2006) | 2 lines Fix AST compiler bug #1501934: incorrect LOAD/STORE_GLOBAL generation. ........ r50495 | neil.schemenauer | 2006-07-09 23:19:29 +0200 (Sun, 09 Jul 2006) | 2 lines Fix SF bug 1441486: bad unary minus folding in compiler. ........ r50497 | neal.norwitz | 2006-07-10 00:14:42 +0200 (Mon, 10 Jul 2006) | 4 lines On 64 bit systems, int literals that use less than 64 bits are now ints rather than longs. This also fixes the test for eval(-sys.maxint - 1). ........ r50500 | neal.norwitz | 2006-07-10 02:04:44 +0200 (Mon, 10 Jul 2006) | 4 lines Bug #1512814, Fix incorrect lineno's when code at module scope started after line 256. ........ r50501 | neal.norwitz | 2006-07-10 02:05:34 +0200 (Mon, 10 Jul 2006) | 1 line Fix doco. Backport candidate. ........ r50503 | neal.norwitz | 2006-07-10 02:23:17 +0200 (Mon, 10 Jul 2006) | 5 lines Part of SF patch #1484695. This removes dead code. The chksum was already verified in .frombuf() on the lines above. If there was a problem an exception is raised, so there was no way this condition could have been true. ........ r50504 | neal.norwitz | 2006-07-10 03:18:57 +0200 (Mon, 10 Jul 2006) | 3 lines Patch #1516912: improve Modules support for OpenVMS. ........ r50506 | neal.norwitz | 2006-07-10 04:36:41 +0200 (Mon, 10 Jul 2006) | 7 lines Patch #1504046: Add documentation for xml.etree. /F wrote the text docs, Englebert Gruber massaged it to latex and I did some more massaging to try and improve the consistency and fix some name mismatches between the declaration and text. ........ r50509 | martin.v.loewis | 2006-07-10 09:23:48 +0200 (Mon, 10 Jul 2006) | 2 lines Introduce DISTUTILS_USE_SDK as a flag to determine whether the SDK environment should be used. Fixes #1508010. ........ r50510 | martin.v.loewis | 2006-07-10 09:26:41 +0200 (Mon, 10 Jul 2006) | 1 line Change error message to indicate that VS2003 is necessary to build extension modules, not the .NET SDK. ........ r50511 | martin.v.loewis | 2006-07-10 09:29:41 +0200 (Mon, 10 Jul 2006) | 1 line Add svn:ignore. ........ r50512 | anthony.baxter | 2006-07-10 09:41:04 +0200 (Mon, 10 Jul 2006) | 1 line preparing for 2.5b2 ........ r50513 | thomas.heller | 2006-07-10 11:10:28 +0200 (Mon, 10 Jul 2006) | 2 lines Fix bug #1518190: accept any integer or long value in the ctypes.c_void_p constructor. ........ r50514 | thomas.heller | 2006-07-10 11:31:06 +0200 (Mon, 10 Jul 2006) | 3 lines Fixed a segfault when ctypes.wintypes were imported on non-Windows machines. ........ r50516 | thomas.heller | 2006-07-10 13:11:10 +0200 (Mon, 10 Jul 2006) | 3 lines Assigning None to pointer type structure fields possible overwrote wrong fields. ........ r50517 | thomas.heller | 2006-07-10 13:17:37 +0200 (Mon, 10 Jul 2006) | 5 lines Moved the ctypes news entries from the 'Library' section into the 'Extension Modules' section where they belong, probably. This destroyes the original order of the news entries, don't know if that is important or not. ........ r50526 | phillip.eby | 2006-07-10 21:03:29 +0200 (Mon, 10 Jul 2006) | 2 lines Fix SF#1516184 and add a test to prevent regression. ........ r50528 | phillip.eby | 2006-07-10 21:18:35 +0200 (Mon, 10 Jul 2006) | 2 lines Fix SF#1457312: bad socket error handling in distutils "upload" command. ........ r50537 | peter.astrand | 2006-07-10 22:39:49 +0200 (Mon, 10 Jul 2006) | 1 line Make it possible to run test_subprocess.py with Python 2.2, which lacks test_support.reap_children(). ........ r50541 | tim.peters | 2006-07-10 23:08:24 +0200 (Mon, 10 Jul 2006) | 5 lines After approval from Anthony, merge the tim-current_frames branch into the trunk. This adds a new sys._current_frames() function, which returns a dict mapping thread id to topmost thread stack frame. ........ r50542 | tim.peters | 2006-07-10 23:11:49 +0200 (Mon, 10 Jul 2006) | 2 lines Whitespace normalization. ........ r50553 | martin.v.loewis | 2006-07-11 00:11:28 +0200 (Tue, 11 Jul 2006) | 4 lines Patch #1519566: Remove unused _tofill member. Make begin_fill idempotent. Update demo2 to demonstrate filling of concave shapes. ........ r50567 | anthony.baxter | 2006-07-11 04:04:09 +0200 (Tue, 11 Jul 2006) | 4 lines #1494314: Fix a regression with high-numbered sockets in 2.4.3. This means that select() on sockets > FD_SETSIZE (typically 1024) work again. The patch makes sockets use poll() internally where available. ........ r50568 | tim.peters | 2006-07-11 04:17:48 +0200 (Tue, 11 Jul 2006) | 2 lines Whitespace normalization. ........ r50575 | thomas.heller | 2006-07-11 18:42:05 +0200 (Tue, 11 Jul 2006) | 1 line Add missing Py_DECREF. ........ r50576 | thomas.heller | 2006-07-11 18:44:25 +0200 (Tue, 11 Jul 2006) | 1 line Add missing Py_DECREFs. ........ r50579 | andrew.kuchling | 2006-07-11 19:20:16 +0200 (Tue, 11 Jul 2006) | 1 line Bump version number; add sys._current_frames ........ r50582 | thomas.heller | 2006-07-11 20:28:35 +0200 (Tue, 11 Jul 2006) | 3 lines When a foreign function is retrived by calling __getitem__ on a ctypes library instance, do not set it as attribute. ........ r50583 | thomas.heller | 2006-07-11 20:40:50 +0200 (Tue, 11 Jul 2006) | 2 lines Change the ctypes version number to 1.0.0. ........ r50597 | neal.norwitz | 2006-07-12 07:26:17 +0200 (Wed, 12 Jul 2006) | 3 lines Bug #1520864: unpacking singleton tuples in for loop (for x, in) work again. ........ r50598 | neal.norwitz | 2006-07-12 07:26:35 +0200 (Wed, 12 Jul 2006) | 1 line Fix function name in error msg ........ r50599 | neal.norwitz | 2006-07-12 07:27:46 +0200 (Wed, 12 Jul 2006) | 4 lines Fix uninitialized memory read reported by Valgrind when running doctest. This could happen if size == 0. ........ r50600 | neal.norwitz | 2006-07-12 09:28:29 +0200 (Wed, 12 Jul 2006) | 1 line Actually change the MAGIC #. Create a new section for 2.5c1 and mention the impact of changing the MAGIC #. ........ r50601 | thomas.heller | 2006-07-12 10:43:47 +0200 (Wed, 12 Jul 2006) | 3 lines Fix #1467450: ctypes now uses RTLD_GLOBAL by default on OSX 10.3 to load shared libraries. ........ r50604 | thomas.heller | 2006-07-12 16:25:18 +0200 (Wed, 12 Jul 2006) | 3 lines Fix the wrong description of LibraryLoader.LoadLibrary, and document the DEFAULT_MODE constant. ........ r50607 | georg.brandl | 2006-07-12 17:31:17 +0200 (Wed, 12 Jul 2006) | 3 lines Accept long options "--help" and "--version". ........ r50617 | thomas.heller | 2006-07-13 11:53:47 +0200 (Thu, 13 Jul 2006) | 3 lines A misspelled preprocessor symbol caused ctypes to be always compiled without thread support. Replaced WITH_THREADS with WITH_THREAD. ........ r50619 | thomas.heller | 2006-07-13 19:01:14 +0200 (Thu, 13 Jul 2006) | 3 lines Fix #1521375. When running with root priviledges, 'gcc -o /dev/null' did overwrite /dev/null. Use a temporary file instead of /dev/null. ........ r50620 | thomas.heller | 2006-07-13 19:05:13 +0200 (Thu, 13 Jul 2006) | 2 lines Fix misleading words. ........ r50622 | andrew.kuchling | 2006-07-13 19:37:26 +0200 (Thu, 13 Jul 2006) | 1 line Typo fix ........ r50629 | georg.brandl | 2006-07-14 09:12:54 +0200 (Fri, 14 Jul 2006) | 3 lines Patch #1521874: grammar errors in doanddont.tex. ........ r50630 | neal.norwitz | 2006-07-14 09:20:04 +0200 (Fri, 14 Jul 2006) | 1 line Try to improve grammar further. ........ r50631 | martin.v.loewis | 2006-07-14 11:58:55 +0200 (Fri, 14 Jul 2006) | 1 line Extend build_ssl to Win64, using VSExtComp. ........ r50632 | martin.v.loewis | 2006-07-14 14:10:09 +0200 (Fri, 14 Jul 2006) | 1 line Add debug output to analyse buildbot failure. ........ r50633 | martin.v.loewis | 2006-07-14 14:31:05 +0200 (Fri, 14 Jul 2006) | 1 line Fix Debug build of _ssl. ........ r50636 | andrew.kuchling | 2006-07-14 15:32:38 +0200 (Fri, 14 Jul 2006) | 1 line Mention new options ........ r50638 | peter.astrand | 2006-07-14 16:04:45 +0200 (Fri, 14 Jul 2006) | 1 line Bug #1223937: CalledProcessError.errno -> CalledProcessError.returncode. ........ r50640 | thomas.heller | 2006-07-14 17:01:05 +0200 (Fri, 14 Jul 2006) | 4 lines Make the prototypes of our private PyUnicode_FromWideChar and PyUnicode_AsWideChar replacement functions compatible to the official functions by using Py_ssize_t instead of int. ........ r50643 | thomas.heller | 2006-07-14 19:51:14 +0200 (Fri, 14 Jul 2006) | 3 lines Patch #1521817: The index range checking on ctypes arrays containing exactly one element is enabled again. ........ r50647 | thomas.heller | 2006-07-14 20:22:50 +0200 (Fri, 14 Jul 2006) | 2 lines Updates for the ctypes documentation. ........ r50655 | fredrik.lundh | 2006-07-14 23:45:48 +0200 (Fri, 14 Jul 2006) | 3 lines typo ........ r50664 | george.yoshida | 2006-07-15 18:03:49 +0200 (Sat, 15 Jul 2006) | 2 lines Bug #15187702 : ext/win-cookbook.html has a broken link to distutils ........ r50667 | bob.ippolito | 2006-07-15 18:53:15 +0200 (Sat, 15 Jul 2006) | 1 line Patch #1220874: Update the binhex module for Mach-O. ........ r50671 | fred.drake | 2006-07-16 03:21:20 +0200 (Sun, 16 Jul 2006) | 1 line clean up some link markup ........ r50673 | neal.norwitz | 2006-07-16 03:50:38 +0200 (Sun, 16 Jul 2006) | 4 lines Bug #1512814, Fix incorrect lineno's when code within a function had more than 255 blank lines. Byte codes need to go first, line #s second. ........ r50674 | neal.norwitz | 2006-07-16 04:00:32 +0200 (Sun, 16 Jul 2006) | 5 lines a & b were dereffed above, so they are known to be valid pointers. z is known to be NULL, nothing to DECREF. Reported by Klockwork, #107. ........ r50675 | neal.norwitz | 2006-07-16 04:02:57 +0200 (Sun, 16 Jul 2006) | 5 lines self is dereffed (and passed as first arg), so it's known to be good. func is returned from PyArg_ParseTuple and also dereffed. Reported by Klocwork, #30 (self one at least). ........ r50676 | neal.norwitz | 2006-07-16 04:05:35 +0200 (Sun, 16 Jul 2006) | 4 lines proto was dereffed above and is known to be good. No need for X. Reported by Klocwork, #39. ........ r50677 | neal.norwitz | 2006-07-16 04:15:27 +0200 (Sun, 16 Jul 2006) | 5 lines Fix memory leaks in some conditions. Reported by Klocwork #152. ........ r50678 | neal.norwitz | 2006-07-16 04:17:36 +0200 (Sun, 16 Jul 2006) | 4 lines Fix memory leak under some conditions. Reported by Klocwork, #98. ........ r50679 | neal.norwitz | 2006-07-16 04:22:30 +0200 (Sun, 16 Jul 2006) | 8 lines Use sizeof(buffer) instead of duplicating the constants to ensure they won't be wrong. The real change is to pass (bufsz - 1) to PyOS_ascii_formatd and 1 to strncat. strncat copies n+1 bytes from src (not dest). Reported by Klocwork #58. ........ r50680 | neal.norwitz | 2006-07-16 04:32:03 +0200 (Sun, 16 Jul 2006) | 5 lines Handle a NULL name properly. Reported by Klocwork #67 ........ r50681 | neal.norwitz | 2006-07-16 04:35:47 +0200 (Sun, 16 Jul 2006) | 6 lines PyFunction_SetDefaults() is documented as taking None or a tuple. A NULL would crash the PyTuple_Check(). Now make NULL return a SystemError. Reported by Klocwork #73. ........ r50683 | neal.norwitz | 2006-07-17 02:55:45 +0200 (Mon, 17 Jul 2006) | 5 lines Stop INCREFing name, then checking if it's NULL. name (f_name) should never be NULL so assert it. Fix one place where we could have passed NULL. Reported by Klocwork #66. ........ r50684 | neal.norwitz | 2006-07-17 02:57:15 +0200 (Mon, 17 Jul 2006) | 5 lines otherset is known to be non-NULL based on checks before and DECREF after. DECREF otherset rather than XDECREF in error conditions too. Reported by Klockwork #154. ........ r50685 | neal.norwitz | 2006-07-17 02:59:04 +0200 (Mon, 17 Jul 2006) | 7 lines Reported by Klocwork #151. v2 can be NULL if exception2 is NULL. I don't think that condition can happen, but I'm not sure it can't either. Now the code will protect against either being NULL. ........ r50686 | neal.norwitz | 2006-07-17 03:00:16 +0200 (Mon, 17 Jul 2006) | 1 line Add NEWS entry for a bunch of fixes due to warnings produced by Klocworks static analysis tool. ........ r50687 | fred.drake | 2006-07-17 07:47:52 +0200 (Mon, 17 Jul 2006) | 3 lines document xmlcore (still minimal; needs mention in each of the xml.* modules) SF bug #1504456 (partial) ........ r50688 | georg.brandl | 2006-07-17 15:23:46 +0200 (Mon, 17 Jul 2006) | 3 lines Remove usage of sets module (patch #1500609). ........ r50689 | georg.brandl | 2006-07-17 15:26:33 +0200 (Mon, 17 Jul 2006) | 3 lines Add missing NEWS item (#1522771) ........ r50690 | andrew.kuchling | 2006-07-17 18:47:54 +0200 (Mon, 17 Jul 2006) | 1 line Attribute more features ........ r50692 | kurt.kaiser | 2006-07-17 23:59:27 +0200 (Mon, 17 Jul 2006) | 8 lines Patch 1479219 - Tal Einat 1. 'as' highlighted as builtin in comment string on import line 2. Comments such as "#False identity" which start with a keyword immediately after the '#' character aren't colored as comments. 3. u or U beginning unicode string not correctly highlighted Closes bug 1325071 ........ r50693 | barry.warsaw | 2006-07-18 01:07:51 +0200 (Tue, 18 Jul 2006) | 16 lines decode_rfc2231(): Be more robust against buggy RFC 2231 encodings. Specifically, instead of raising a ValueError when there is a single tick in the parameter, simply return that the entire string unquoted, with None for both the charset and the language. Also, if there are more than 2 ticks in the parameter, interpret the first three parts as the standard RFC 2231 parts, then the rest of the parts as the encoded string. Test cases added. Original fewer-than-3-parts fix by Tokio Kikuchi. Resolves SF bug # 1218081. I will back port the fix and tests to Python 2.4 (email 3.0) and Python 2.3 (email 2.5). Also, bump the version number to email 4.0.1, removing the 'alpha' moniker. ........ r50695 | kurt.kaiser | 2006-07-18 06:03:16 +0200 (Tue, 18 Jul 2006) | 2 lines Rebinding Tab key was inserting 'tab' instead of 'Tab'. Bug 1179168. ........ r50696 | brett.cannon | 2006-07-18 06:41:36 +0200 (Tue, 18 Jul 2006) | 6 lines Fix bug #1520914. Starting in 2.4, time.strftime() began to check the bounds of values in the time tuple passed in. Unfortunately people came to rely on undocumented behaviour of setting unneeded values to 0, regardless of if it was within the valid range. Now those values force the value internally to the minimum value when 0 is passed in. ........ r50697 | facundo.batista | 2006-07-18 14:16:13 +0200 (Tue, 18 Jul 2006) | 1 line Comments and docs cleanups, and some little fixes, provided by Santiágo Peresón ........ r50704 | martin.v.loewis | 2006-07-18 19:46:31 +0200 (Tue, 18 Jul 2006) | 2 lines Patch #1524429: Use repr instead of backticks again. ........ r50706 | tim.peters | 2006-07-18 23:55:15 +0200 (Tue, 18 Jul 2006) | 2 lines Whitespace normalization. ........ r50708 | tim.peters | 2006-07-19 02:03:19 +0200 (Wed, 19 Jul 2006) | 18 lines SF bug 1524317: configure --without-threads fails to build Moved the code for _PyThread_CurrentFrames() up, so it's no longer in a huge "#ifdef WITH_THREAD" block (I didn't realize it /was/ in one). Changed test_sys's test_current_frames() so it passes with or without thread supported compiled in. Note that test_sys fails when Python is compiled without threads, but for an unrelated reason (the old test_exit() fails with an indirect ImportError on the `thread` module). There are also other unrelated compilation failures without threads, in extension modules (like ctypes); at least the core compiles again. Do we really support --without-threads? If so, there are several problems remaining. ........ r50713 | thomas.heller | 2006-07-19 11:09:32 +0200 (Wed, 19 Jul 2006) | 4 lines Make sure the _ctypes extension can be compiled when WITH_THREAD is not defined on Windows, even if that configuration is probably not supported at all. ........ r50715 | martin.v.loewis | 2006-07-19 19:18:32 +0200 (Wed, 19 Jul 2006) | 4 lines Revert r50706 (Whitespace normalization) and r50697: Comments and docs cleanups, and some little fixes per recommendation from Raymond Hettinger. ........ r50719 | phillip.eby | 2006-07-20 17:54:16 +0200 (Thu, 20 Jul 2006) | 4 lines Fix SF#1516184 (again) and add a test to prevent regression. (There was a problem with empty filenames still causing recursion) ........ r50720 | georg.brandl | 2006-07-20 18:28:39 +0200 (Thu, 20 Jul 2006) | 3 lines Guard for _active being None in __del__ method. ........ r50721 | vinay.sajip | 2006-07-20 18:28:39 +0200 (Thu, 20 Jul 2006) | 1 line Updated documentation for TimedRotatingFileHandler relating to how rollover files are named. The previous documentation was wrongly the same as for RotatingFileHandler. ........ r50731 | fred.drake | 2006-07-20 22:11:57 +0200 (Thu, 20 Jul 2006) | 1 line markup fix ........ r50739 | kurt.kaiser | 2006-07-21 00:22:52 +0200 (Fri, 21 Jul 2006) | 7 lines Avoid occasional failure to detect closing paren properly. Patch 1407280 Tal Einat M ParenMatch.py M NEWS.txt M CREDITS.txt ........ r50740 | vinay.sajip | 2006-07-21 01:20:12 +0200 (Fri, 21 Jul 2006) | 1 line Addressed SF#1524081 by using a dictionary to map level names to syslog priority names, rather than a string.lower(). ........ r50741 | neal.norwitz | 2006-07-21 07:29:58 +0200 (Fri, 21 Jul 2006) | 1 line Add some asserts that we got good params passed ........ r50742 | neal.norwitz | 2006-07-21 07:31:02 +0200 (Fri, 21 Jul 2006) | 5 lines Move the initialization of some pointers earlier. The problem is that if we call Py_DECREF(frame) like we do if allocating locals fails, frame_dealloc() will try to use these bogus values and crash. ........ r50743 | neal.norwitz | 2006-07-21 07:32:28 +0200 (Fri, 21 Jul 2006) | 4 lines Handle allocation failures gracefully. Found with failmalloc. Many (all?) of these could be backported. ........ r50745 | neal.norwitz | 2006-07-21 09:59:02 +0200 (Fri, 21 Jul 2006) | 1 line Speel initialise write. Tanks Anthony. ........ r50746 | neal.norwitz | 2006-07-21 09:59:47 +0200 (Fri, 21 Jul 2006) | 2 lines Handle more memory allocation failures without crashing. ........ r50754 | barry.warsaw | 2006-07-21 16:51:07 +0200 (Fri, 21 Jul 2006) | 23 lines More RFC 2231 improvements for the email 4.0 package. As Mark Sapiro rightly points out there are really two types of continued headers defined in this RFC (i.e. "encoded" parameters with the form "name*0*=" and unencoded parameters with the form "name*0="), but we were were handling them both the same way and that isn't correct. This patch should be much more RFC compliant in that only encoded params are %-decoded and the charset/language information is only extract if there are any encoded params in the segments. If there are no encoded params then the RFC says that there will be no charset/language parts. Note however that this will change the return value for Message.get_param() in some cases. For example, whereas before if you had all unencoded param continuations you would have still gotten a 3-tuple back from this method (with charset and language == None), you will now get just a string. I don't believe this is a backward incompatible change though because the documentation for this method already indicates that either return value is possible and that you must do an isinstance(val, tuple) check to discriminate between the two. (Yeah that API kind of sucks but we can't change /that/ without breaking code.) Test cases, some documentation updates, and a NEWS item accompany this patch. ........ r50759 | georg.brandl | 2006-07-21 19:36:31 +0200 (Fri, 21 Jul 2006) | 3 lines Fix check for empty list (vs. None). ........ r50771 | brett.cannon | 2006-07-22 00:44:07 +0200 (Sat, 22 Jul 2006) | 2 lines Remove an XXX marker in a comment. ........ r50773 | neal.norwitz | 2006-07-22 18:20:49 +0200 (Sat, 22 Jul 2006) | 1 line Fix more memory allocation issues found with failmalloc. ........ r50774 | neal.norwitz | 2006-07-22 19:00:57 +0200 (Sat, 22 Jul 2006) | 1 line Don't fail if the directory already exists ........ r50775 | greg.ward | 2006-07-23 04:25:53 +0200 (Sun, 23 Jul 2006) | 6 lines Be a lot smarter about whether this test passes: instead of assuming that a 2.93 sec audio file will always take 3.1 sec (as it did on the hardware I had when I first wrote the test), expect that it will take 2.93 sec +/- 10%, and only fail if it's outside of that range. Compute the expected ........ r50776 | kurt.kaiser | 2006-07-23 06:19:49 +0200 (Sun, 23 Jul 2006) | 2 lines Tooltips failed on new-syle class __init__ args. Bug 1027566 Loren Guthrie ........ r50777 | neal.norwitz | 2006-07-23 09:50:36 +0200 (Sun, 23 Jul 2006) | 1 line Handle more mem alloc issues found with failmalloc ........ r50778 | neal.norwitz | 2006-07-23 09:51:58 +0200 (Sun, 23 Jul 2006) | 5 lines If the for loop isn't entered, entryblock will be NULL. If passed to stackdepth_walk it will be dereffed. Not sure if I found with failmalloc or Klockwork #55. ........ r50779 | neal.norwitz | 2006-07-23 09:53:14 +0200 (Sun, 23 Jul 2006) | 4 lines Move the initialization of size_a down below the check for a being NULL. Reported by Klocwork #106 ........ r50780 | neal.norwitz | 2006-07-23 09:55:55 +0200 (Sun, 23 Jul 2006) | 9 lines Check the allocation of b_objects and return if there was a failure. Also fix a few memory leaks in other failure scenarios. It seems that if b_objects == Py_None, we will have an extra ref to b_objects. Add XXX comment so hopefully someone documents why the else isn't necessary or adds it in. Reported by Klocwork #20 ........ r50781 | neal.norwitz | 2006-07-23 09:57:11 +0200 (Sun, 23 Jul 2006) | 2 lines Fix memory leaks spotted by Klocwork #37. ........ r50782 | neal.norwitz | 2006-07-23 09:59:00 +0200 (Sun, 23 Jul 2006) | 5 lines nextlink can be NULL if teedataobject_new fails, so use XINCREF. Ensure that dataobj is never NULL. Reported by Klocwork #102 ........ r50783 | neal.norwitz | 2006-07-23 10:01:43 +0200 (Sun, 23 Jul 2006) | 8 lines Ensure we don't write beyond errText. I think I got this right, but it definitely could use some review to ensure I'm not off by one and there's no possible overflow/wrap-around of bytes_left. Reported by Klocwork #1. Fix a problem if there is a failure allocating self->db. Found with failmalloc. ........ r50784 | ronald.oussoren | 2006-07-23 11:41:09 +0200 (Sun, 23 Jul 2006) | 3 lines Without this patch CMD-W won't close EditorWindows on MacOS X. This solves part of bug #1517990. ........ r50785 | ronald.oussoren | 2006-07-23 11:46:11 +0200 (Sun, 23 Jul 2006) | 5 lines Fix for bug #1517996: Class and Path browsers show Tk menu This patch replaces the menubar that is used by AquaTk for windows without a menubar of their own by one that is more appropriate for IDLE. ........ r50786 | andrew.macintyre | 2006-07-23 14:57:02 +0200 (Sun, 23 Jul 2006) | 2 lines Build updates for OS/2 EMX port ........ r50787 | andrew.macintyre | 2006-07-23 15:00:04 +0200 (Sun, 23 Jul 2006) | 3 lines bugfix: PyThread_start_new_thread() returns the thread ID, not a flag; will backport. ........ r50789 | andrew.macintyre | 2006-07-23 15:04:00 +0200 (Sun, 23 Jul 2006) | 2 lines Get mailbox module working on OS/2 EMX port. ........ r50791 | greg.ward | 2006-07-23 18:05:51 +0200 (Sun, 23 Jul 2006) | 1 line Resync optparse with Optik 1.5.3: minor tweaks for/to tests. ........ r50794 | martin.v.loewis | 2006-07-24 07:05:22 +0200 (Mon, 24 Jul 2006) | 2 lines Update list of unsupported systems. Fixes #1510853. ........ r50795 | martin.v.loewis | 2006-07-24 12:26:33 +0200 (Mon, 24 Jul 2006) | 1 line Patch #1448199: Release GIL around ConnectRegistry. ........ r50796 | martin.v.loewis | 2006-07-24 13:54:53 +0200 (Mon, 24 Jul 2006) | 3 lines Patch #1232023: Don't include empty path component from registry, so that the current directory does not get added to sys.path. Also fixes #1526785. ........ r50797 | martin.v.loewis | 2006-07-24 14:54:17 +0200 (Mon, 24 Jul 2006) | 3 lines Bug #1524310: Properly report errors from FindNextFile in os.listdir. Will backport to 2.4. ........ r50800 | georg.brandl | 2006-07-24 15:28:57 +0200 (Mon, 24 Jul 2006) | 7 lines Patch #1523356: fix determining include dirs in python-config. Also don't install "python-config" when doing altinstall, but always install "python-config2.x" and make a link to it like with the main executable. ........ r50802 | georg.brandl | 2006-07-24 15:46:47 +0200 (Mon, 24 Jul 2006) | 3 lines Patch #1527744: right order of includes in order to have HAVE_CONIO_H defined properly. ........ r50803 | georg.brandl | 2006-07-24 16:09:56 +0200 (Mon, 24 Jul 2006) | 3 lines Patch #1515343: Fix printing of deprecated string exceptions with a value in the traceback module. ........ r50804 | kurt.kaiser | 2006-07-24 19:13:23 +0200 (Mon, 24 Jul 2006) | 7 lines EditorWindow failed when used stand-alone if sys.ps1 not set. Bug 1010370 Dave Florek M EditorWindow.py M PyShell.py M NEWS.txt ........ r50805 | kurt.kaiser | 2006-07-24 20:05:51 +0200 (Mon, 24 Jul 2006) | 6 lines - EditorWindow.test() was failing. Bug 1417598 M EditorWindow.py M ScriptBinding.py M NEWS.txt ........ r50808 | georg.brandl | 2006-07-24 22:11:35 +0200 (Mon, 24 Jul 2006) | 3 lines Repair accidental NameError. ........ r50809 | tim.peters | 2006-07-24 23:02:15 +0200 (Mon, 24 Jul 2006) | 2 lines Whitespace normalization. ........ r50810 | greg.ward | 2006-07-25 04:11:12 +0200 (Tue, 25 Jul 2006) | 3 lines Don't use standard assert: want tests to fail even when run with -O. Delete cruft. ........ r50811 | tim.peters | 2006-07-25 06:07:22 +0200 (Tue, 25 Jul 2006) | 10 lines current_frames_with_threads(): There's actually no way to guess /which/ line the spawned thread is in at the time sys._current_frames() is called: we know it finished enter_g.set(), but can't know whether the instruction counter has advanced to the following leave_g.wait(). The latter is overwhelming most likely, but not guaranteed, and I see that the "x86 Ubuntu dapper (icc) trunk" buildbot found it on the other line once. Changed the test so it passes in either case. ........ r50815 | martin.v.loewis | 2006-07-25 11:53:12 +0200 (Tue, 25 Jul 2006) | 2 lines Bug #1525817: Don't truncate short lines in IDLE's tool tips. ........ r50816 | martin.v.loewis | 2006-07-25 12:05:47 +0200 (Tue, 25 Jul 2006) | 3 lines Bug #978833: Really close underlying socket in _socketobject.close. Will backport to 2.4. ........ r50817 | martin.v.loewis | 2006-07-25 12:11:14 +0200 (Tue, 25 Jul 2006) | 1 line Revert incomplete checkin. ........ r50819 | georg.brandl | 2006-07-25 12:22:34 +0200 (Tue, 25 Jul 2006) | 4 lines Patch #1525766: correctly pass onerror arg to recursive calls of pkg.walk_packages. Also improve the docstrings. ........ r50825 | brett.cannon | 2006-07-25 19:32:20 +0200 (Tue, 25 Jul 2006) | 2 lines Add comment for changes to test_ossaudiodev. ........ r50826 | brett.cannon | 2006-07-25 19:34:36 +0200 (Tue, 25 Jul 2006) | 3 lines Fix a bug in the messages for an assert failure where not enough arguments to a string were being converted in the format. ........ r50828 | armin.rigo | 2006-07-25 20:09:57 +0200 (Tue, 25 Jul 2006) | 2 lines Document why is and is not a good way to fix the gc_inspection crasher. ........ r50829 | armin.rigo | 2006-07-25 20:11:07 +0200 (Tue, 25 Jul 2006) | 5 lines Added another crasher, which hit me today (I was not intentionally writing such code, of course, but it took some gdb time to figure out what my bug was). ........ r50830 | armin.rigo | 2006-07-25 20:38:39 +0200 (Tue, 25 Jul 2006) | 3 lines Document the crashers that will not go away soon as "won't fix", and explain why. ........ r50831 | ronald.oussoren | 2006-07-25 21:13:35 +0200 (Tue, 25 Jul 2006) | 3 lines Install the compatibility symlink to libpython.a on OSX using 'ln -sf' instead of 'ln -s', this avoid problems when reinstalling python. ........ r50832 | ronald.oussoren | 2006-07-25 21:20:54 +0200 (Tue, 25 Jul 2006) | 7 lines Fix for bug #1525447 (renaming to MacOSmodule.c would also work, but not without causing problems for anyone that is on a case-insensitive filesystem). Setup.py tries to compile the MacOS extension from MacOSmodule.c, while the actual file is named macosmodule.c. This is no problem on the (default) case-insensitive filesystem, but doesn't work on case-sensitive filesystems. ........ r50833 | ronald.oussoren | 2006-07-25 22:28:55 +0200 (Tue, 25 Jul 2006) | 7 lines Fix bug #1517990: IDLE keybindings on OSX This adds a new key definition for OSX, which is slightly different from the classic mac definition. Also add NEWS item for a couple of bugfixes I added recently. ........ r50834 | tim.peters | 2006-07-26 00:30:24 +0200 (Wed, 26 Jul 2006) | 2 lines Whitespace normalization. ........ r50839 | neal.norwitz | 2006-07-26 06:00:18 +0200 (Wed, 26 Jul 2006) | 1 line Hmm, only python2.x is installed, not plain python. Did that change recently? ........ r50840 | barry.warsaw | 2006-07-26 07:54:46 +0200 (Wed, 26 Jul 2006) | 6 lines Forward port some fixes that were in email 2.5 but for some reason didn't make it into email 4.0. Specifically, in Message.get_content_charset(), handle RFC 2231 headers that contain an encoding not known to Python, or a character in the data that isn't in the charset encoding. Also forward port the appropriate unit tests. ........ r50841 | georg.brandl | 2006-07-26 09:23:32 +0200 (Wed, 26 Jul 2006) | 3 lines NEWS entry for #1525766. ........ r50842 | georg.brandl | 2006-07-26 09:40:17 +0200 (Wed, 26 Jul 2006) | 3 lines Bug #1459963: properly capitalize HTTP header names. ........ r50843 | georg.brandl | 2006-07-26 10:03:10 +0200 (Wed, 26 Jul 2006) | 6 lines Part of bug #1523610: fix miscalculation of buffer length. Also add a guard against NULL in converttuple and add a test case (that previously would have crashed). ........ r50844 | martin.v.loewis | 2006-07-26 14:12:56 +0200 (Wed, 26 Jul 2006) | 3 lines Bug #978833: Really close underlying socket in _socketobject.close. Fix httplib.HTTPConnection.getresponse to not close the socket if it is still needed for the response. ........ r50845 | andrew.kuchling | 2006-07-26 19:16:52 +0200 (Wed, 26 Jul 2006) | 1 line [Bug #1471938] Fix build problem on Solaris 8 by conditionalizing the use of mvwgetnstr(); it was conditionalized a few lines below. Fix from Paul Eggert. I also tried out the STRICT_SYSV_CURSES case and am therefore removing the 'untested' comment. ........ r50846 | andrew.kuchling | 2006-07-26 19:18:01 +0200 (Wed, 26 Jul 2006) | 1 line Correct error message ........ r50847 | andrew.kuchling | 2006-07-26 19:19:39 +0200 (Wed, 26 Jul 2006) | 1 line Minor grammar fix ........ r50848 | andrew.kuchling | 2006-07-26 19:22:21 +0200 (Wed, 26 Jul 2006) | 1 line Put news item in right section ........ r50850 | andrew.kuchling | 2006-07-26 20:03:12 +0200 (Wed, 26 Jul 2006) | 1 line Use sys.exc_info() ........ r50851 | andrew.kuchling | 2006-07-26 20:15:45 +0200 (Wed, 26 Jul 2006) | 1 line Use sys.exc_info() ........ r50852 | phillip.eby | 2006-07-26 21:48:27 +0200 (Wed, 26 Jul 2006) | 4 lines Allow the 'onerror' argument to walk_packages() to catch any Exception, not just ImportError. This allows documentation tools to better skip unimportable packages. ........ r50854 | tim.peters | 2006-07-27 01:23:15 +0200 (Thu, 27 Jul 2006) | 2 lines Whitespace normalization. ........ r50855 | tim.peters | 2006-07-27 03:14:53 +0200 (Thu, 27 Jul 2006) | 21 lines Bug #1521947: possible bug in mystrtol.c with recent gcc. In general, C doesn't define anything about what happens when an operation on a signed integral type overflows, and PyOS_strtol() did several formally undefined things of that nature on signed longs. Some version of gcc apparently tries to exploit that now, and PyOS_strtol() could fail to detect overflow then. Tried to repair all that, although it seems at least as likely to me that we'll get screwed by bad platform definitions for LONG_MIN and/or LONG_MAX now. For that reason, I don't recommend backporting this. Note that I have no box on which this makes a lick of difference -- can't really test it, except to note that it didn't break anything on my boxes. Silent change: PyOS_strtol() used to return the hard-coded 0x7fffffff in case of overflow. Now it returns LONG_MAX. They're the same only on 32-bit boxes (although C doesn't guarantee that either ...). ........ r50856 | neal.norwitz | 2006-07-27 05:51:58 +0200 (Thu, 27 Jul 2006) | 6 lines Don't kill a normal instance of python running on windows when checking to kill a cygwin instance. build\\python.exe was matching a normal windows instance. Prefix that with a \\ to ensure build is a directory and not PCbuild. As discussed on python-dev. ........ r50857 | neal.norwitz | 2006-07-27 05:55:39 +0200 (Thu, 27 Jul 2006) | 5 lines Closure can't be NULL at this point since we know it's a tuple. Reported by Klocwork # 74. ........ r50858 | neal.norwitz | 2006-07-27 06:04:50 +0200 (Thu, 27 Jul 2006) | 1 line No functional change. Add comment and assert to describe why there cannot be overflow which was reported by Klocwork. Discussed on python-dev ........ r50859 | martin.v.loewis | 2006-07-27 08:38:16 +0200 (Thu, 27 Jul 2006) | 3 lines Bump distutils version to 2.5, as several new features have been introduced since 2.4. ........ r50860 | andrew.kuchling | 2006-07-27 14:18:20 +0200 (Thu, 27 Jul 2006) | 1 line Reformat docstring; fix typo ........ r50861 | georg.brandl | 2006-07-27 17:05:36 +0200 (Thu, 27 Jul 2006) | 6 lines Add test_main() methods. These three tests were never run by regrtest.py. We really need a simpler testing framework. ........ r50862 | tim.peters | 2006-07-27 17:09:20 +0200 (Thu, 27 Jul 2006) | 2 lines News for patch #1529686. ........ r50863 | tim.peters | 2006-07-27 17:11:00 +0200 (Thu, 27 Jul 2006) | 2 lines Whitespace normalization. ........ r50864 | georg.brandl | 2006-07-27 17:38:33 +0200 (Thu, 27 Jul 2006) | 3 lines Amend news entry. ........ r50865 | georg.brandl | 2006-07-27 18:08:15 +0200 (Thu, 27 Jul 2006) | 3 lines Make uuid test suite pass on this box by requesting output with LC_ALL=C. ........ r50866 | andrew.kuchling | 2006-07-27 20:37:33 +0200 (Thu, 27 Jul 2006) | 1 line Add example ........ r50867 | thomas.heller | 2006-07-27 20:39:55 +0200 (Thu, 27 Jul 2006) | 9 lines Remove code that is no longer used (ctypes.com). Fix the DllGetClassObject and DllCanUnloadNow so that they forward the call to the comtypes.server.inprocserver module. The latter was never documented, never used by published code, and didn't work anyway, so I think it does not deserve a NEWS entry (but I might be wrong). ........ r50868 | andrew.kuchling | 2006-07-27 20:41:21 +0200 (Thu, 27 Jul 2006) | 1 line Typo fix ('publically' is rare, poss. non-standard) ........ r50869 | andrew.kuchling | 2006-07-27 20:42:41 +0200 (Thu, 27 Jul 2006) | 1 line Add missing word ........ r50870 | andrew.kuchling | 2006-07-27 20:44:10 +0200 (Thu, 27 Jul 2006) | 1 line Repair typos ........ r50872 | andrew.kuchling | 2006-07-27 20:53:33 +0200 (Thu, 27 Jul 2006) | 1 line Update URL; add example ........ r50873 | andrew.kuchling | 2006-07-27 21:07:29 +0200 (Thu, 27 Jul 2006) | 1 line Add punctuation mark; add some examples ........ r50874 | andrew.kuchling | 2006-07-27 21:11:07 +0200 (Thu, 27 Jul 2006) | 1 line Mention base64 module; rewrite last sentence to be more positive ........ r50875 | andrew.kuchling | 2006-07-27 21:12:49 +0200 (Thu, 27 Jul 2006) | 1 line If binhex is higher-level than binascii, it should come first in the chapter ........ r50876 | tim.peters | 2006-07-27 22:47:24 +0200 (Thu, 27 Jul 2006) | 28 lines check_node(): stop spraying mystery output to stderr. When a node number disagrees, keep track of all sources & the node numbers they reported, and stick all that in the error message. Changed all callers to supply a non-empty "source" argument; made the "source" argument non-optional. On my box, test_uuid still fails, but with the less confusing output: AssertionError: different sources disagree on node: from source 'getnode1', node was 00038a000015 from source 'getnode2', node was 00038a000015 from source 'ipconfig', node was 001111b2b7bf Only the last one appears to be correct; e.g., C:\Code\python\PCbuild>getmac Physical Address Transport Name =================== ========================================================== 00-11-11-B2-B7-BF \Device\Tcpip_{190FB163-5AFD-4483-86A1-2FE16AC61FF1} 62-A1-AC-6C-FD-BE \Device\Tcpip_{8F77DF5A-EA3D-4F1D-975E-D472CEE6438A} E2-1F-01-C6-5D-88 \Device\Tcpip_{CD18F76B-2EF3-409F-9B8A-6481EE70A1E4} I can't find anything on my box with MAC 00-03-8a-00-00-15, and am not clear on where that comes from. ........ r50878 | andrew.kuchling | 2006-07-28 00:40:05 +0200 (Fri, 28 Jul 2006) | 1 line Reword paragraph ........ r50879 | andrew.kuchling | 2006-07-28 00:49:38 +0200 (Fri, 28 Jul 2006) | 1 line Add example ........ r50880 | andrew.kuchling | 2006-07-28 00:49:54 +0200 (Fri, 28 Jul 2006) | 1 line Add example ........ r50881 | barry.warsaw | 2006-07-28 01:43:15 +0200 (Fri, 28 Jul 2006) | 27 lines Patch #1520294: Support for getset and member descriptors in types.py, inspect.py, and pydoc.py. Specifically, this allows for querying the type of an object against these built-in C types and more importantly, for getting their docstrings printed in the interactive interpreter's help() function. This patch includes a new built-in module called _types which provides definitions of getset and member descriptors for use by the types.py module. These types are exposed as types.GetSetDescriptorType and types.MemberDescriptorType. Query functions are provided as inspect.isgetsetdescriptor() and inspect.ismemberdescriptor(). The implementations of these are robust enough to work with Python implementations other than CPython, which may not have these fundamental types. The patch also includes documentation and test suite updates. I commit these changes now under these guiding principles: 1. Silence is assent. The release manager has not said "no", and of the few people that cared enough to respond to the thread, the worst vote was "0". 2. It's easier to ask for forgiveness than permission. 3. It's so dang easy to revert stuff in svn, that you could view this as a forcing function. :) Windows build patches will follow. ........ r50882 | tim.peters | 2006-07-28 01:44:37 +0200 (Fri, 28 Jul 2006) | 4 lines Bug #1529297: The rewrite of doctest for Python 2.4 unintentionally lost that tests are sorted by name before being run. ``DocTestFinder`` has been changed to sort the list of tests it returns. ........ r50883 | tim.peters | 2006-07-28 01:45:48 +0200 (Fri, 28 Jul 2006) | 2 lines Whitespace normalization. ........ r50884 | tim.peters | 2006-07-28 01:46:36 +0200 (Fri, 28 Jul 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r50885 | barry.warsaw | 2006-07-28 01:50:40 +0200 (Fri, 28 Jul 2006) | 4 lines Enable the building of the _types module on Windows. Note that this has only been tested for VS 2003 since that's all I have. ........ r50887 | tim.peters | 2006-07-28 02:23:15 +0200 (Fri, 28 Jul 2006) | 7 lines defdict_reduce(): Plug leaks. We didn't notice these before because test_defaultdict didn't actually do anything before Georg fixed that earlier today. Neal's next refleak run then showed test_defaultdict leaking 9 references on each run. That's repaired by this checkin. ........ r50888 | tim.peters | 2006-07-28 02:30:00 +0200 (Fri, 28 Jul 2006) | 2 lines News about the repaired memory leak in defaultdict. ........ r50889 | gregory.p.smith | 2006-07-28 03:35:25 +0200 (Fri, 28 Jul 2006) | 7 lines - pybsddb Bug #1527939: bsddb module DBEnv dbremove and dbrename methods now allow their database parameter to be None as the sleepycat API allows. Also adds an appropriate test case for DBEnv.dbrename and dbremove. ........ r50895 | neal.norwitz | 2006-07-28 06:22:34 +0200 (Fri, 28 Jul 2006) | 1 line Ensure the actual number matches the expected count ........ r50896 | tim.peters | 2006-07-28 06:51:59 +0200 (Fri, 28 Jul 2006) | 6 lines Live with that "the hardware address" is an ill-defined concept, and that different ways of trying to find "the hardware address" may return different results. Certainly true on both of my Windows boxes, and in different ways (see whining on python-dev). ........ r50897 | neal.norwitz | 2006-07-28 09:21:27 +0200 (Fri, 28 Jul 2006) | 3 lines Try to find the MAC addr on various flavours of Unix. This seems hopeless. The reduces the test_uuid failures, but there's still another method failing. ........ r50898 | martin.v.loewis | 2006-07-28 09:45:49 +0200 (Fri, 28 Jul 2006) | 2 lines Add UUID for upcoming 2.5b3. ........ r50899 | matt.fleming | 2006-07-28 13:27:27 +0200 (Fri, 28 Jul 2006) | 3 lines Allow socketmodule to compile on NetBSD -current, whose bluetooth API differs from both Linux and FreeBSD. Accepted by Neal Norwitz. ........ r50900 | andrew.kuchling | 2006-07-28 14:07:12 +0200 (Fri, 28 Jul 2006) | 1 line [Patch #1529811] Correction to description of r|* mode ........ r50901 | andrew.kuchling | 2006-07-28 14:18:22 +0200 (Fri, 28 Jul 2006) | 1 line Typo fix ........ r50902 | andrew.kuchling | 2006-07-28 14:32:43 +0200 (Fri, 28 Jul 2006) | 1 line Add example ........ r50903 | andrew.kuchling | 2006-07-28 14:33:19 +0200 (Fri, 28 Jul 2006) | 1 line Add example ........ r50904 | andrew.kuchling | 2006-07-28 14:45:55 +0200 (Fri, 28 Jul 2006) | 1 line Don't overwrite built-in name; add some blank lines for readability ........ r50905 | andrew.kuchling | 2006-07-28 14:48:07 +0200 (Fri, 28 Jul 2006) | 1 line Add example. Should I propagate this example to all the other DBM-ish modules, too? ........ r50912 | georg.brandl | 2006-07-28 20:31:39 +0200 (Fri, 28 Jul 2006) | 3 lines Patch #1529686: also run test_email_codecs with regrtest.py. ........ r50913 | georg.brandl | 2006-07-28 20:36:01 +0200 (Fri, 28 Jul 2006) | 3 lines Fix spelling. ........ r50915 | thomas.heller | 2006-07-28 21:42:40 +0200 (Fri, 28 Jul 2006) | 3 lines Remove a useless XXX comment. Cosmetic changes to the code so that the #ifdef _UNICODE block doesn't mess emacs code formatting. ........ r50916 | phillip.eby | 2006-07-28 23:12:07 +0200 (Fri, 28 Jul 2006) | 5 lines Bug #1529871: The speed enhancement patch #921466 broke Python's compliance with PEP 302. This was fixed by adding an ``imp.NullImporter`` type that is used in ``sys.path_importer_cache`` to cache non-directory paths and avoid excessive filesystem operations during imports. ........ r50917 | phillip.eby | 2006-07-28 23:31:54 +0200 (Fri, 28 Jul 2006) | 2 lines Fix svn merge spew. ........ r50918 | thomas.heller | 2006-07-28 23:43:20 +0200 (Fri, 28 Jul 2006) | 4 lines Patch #1529514: More openbsd platforms for ctypes. Regenerated Modules/_ctypes/libffi/configure with autoconf 2.59. Approved by Neal. ........ r50922 | georg.brandl | 2006-07-29 10:51:21 +0200 (Sat, 29 Jul 2006) | 2 lines Bug #835255: The "closure" argument to new.function() is now documented. ........ r50924 | georg.brandl | 2006-07-29 11:33:26 +0200 (Sat, 29 Jul 2006) | 3 lines Bug #1441397: The compiler module now recognizes module and function docstrings correctly as it did in Python 2.4. ........ r50925 | georg.brandl | 2006-07-29 12:25:46 +0200 (Sat, 29 Jul 2006) | 4 lines Revert rev 42617, it was introduced to work around bug #1441397. test_compiler now passes again. ........ r50926 | fred.drake | 2006-07-29 15:22:49 +0200 (Sat, 29 Jul 2006) | 1 line update target version number ........ r50927 | andrew.kuchling | 2006-07-29 15:56:48 +0200 (Sat, 29 Jul 2006) | 1 line Add example ........ r50928 | andrew.kuchling | 2006-07-29 16:04:47 +0200 (Sat, 29 Jul 2006) | 1 line Update URL ........ r50930 | andrew.kuchling | 2006-07-29 16:08:15 +0200 (Sat, 29 Jul 2006) | 1 line Reword paragraph to match the order of the subsequent sections ........ r50931 | andrew.kuchling | 2006-07-29 16:21:15 +0200 (Sat, 29 Jul 2006) | 1 line [Bug #1529157] Mention raw_input() and input(); while I'm at it, reword the description a bit ........ r50932 | andrew.kuchling | 2006-07-29 16:42:48 +0200 (Sat, 29 Jul 2006) | 1 line [Bug #1519571] Document some missing functions: setup(), title(), done() ........ r50933 | andrew.kuchling | 2006-07-29 16:43:55 +0200 (Sat, 29 Jul 2006) | 1 line Fix docstring punctuation ........ r50934 | andrew.kuchling | 2006-07-29 17:10:32 +0200 (Sat, 29 Jul 2006) | 1 line [Bug #1414697] Change docstring of set/frozenset types to specify that the contents are unique. Raymond, please feel free to edit or revert. ........ r50935 | andrew.kuchling | 2006-07-29 17:35:21 +0200 (Sat, 29 Jul 2006) | 1 line [Bug #1530382] Document SSL.server(), .issuer() methods ........ r50936 | andrew.kuchling | 2006-07-29 17:42:46 +0200 (Sat, 29 Jul 2006) | 1 line Typo fix ........ r50937 | andrew.kuchling | 2006-07-29 17:43:13 +0200 (Sat, 29 Jul 2006) | 1 line Tweak wording ........ r50938 | matt.fleming | 2006-07-29 17:55:30 +0200 (Sat, 29 Jul 2006) | 2 lines Fix typo ........ r50939 | andrew.kuchling | 2006-07-29 17:57:08 +0200 (Sat, 29 Jul 2006) | 6 lines [Bug #1528258] Mention that the 'data' argument can be None. The constructor docs referred the reader to the add_data() method's docs, but they weren't very helpful. I've simply copied an earlier explanation of 'data' that's more useful. ........ r50940 | andrew.kuchling | 2006-07-29 18:08:40 +0200 (Sat, 29 Jul 2006) | 1 line Set bug/patch count. Take a bow, everyone! ........ r50941 | fred.drake | 2006-07-29 18:56:15 +0200 (Sat, 29 Jul 2006) | 18 lines expunge the xmlcore changes: 41667, 41668 - initial switch to xmlcore 47044 - mention of xmlcore in What's New 50687 - mention of xmlcore in the library reference re-apply xmlcore changes to xml: 41674 - line ending changes (re-applied manually), directory props 41677 - add cElementTree wrapper 41678 - PSF licensing for etree 41812 - whitespace normalization 42724 - fix svn:eol-style settings 43681, 43682 - remove Python version-compatibility cruft from minidom 46773 - fix encoding of \r\n\t in attr values in saxutils 47269 - added XMLParser alias for cElementTree compatibility additional tests were added in Lib/test/test_sax.py that failed with the xmlcore changes; these relate to SF bugs #1511497, #1513611 ........ r50942 | andrew.kuchling | 2006-07-29 20:14:07 +0200 (Sat, 29 Jul 2006) | 17 lines Reorganize the docs for 'file' and 'open()' after some discussion with Fred. We want to encourage users to write open() when opening a file, but open() was described with a single paragraph and 'file' had lots of explanation of the mode and bufsize arguments. I've shrunk the description of 'file' to cross-reference to the 'File objects' section, and to open() for an explanation of the arguments. open() now has all the paragraphs about the mode string. The bufsize argument was moved up so that it isn't buried at the end; now there's 1 paragraph on mode, 1 on bufsize, and then 3 more on mode. Various other edits and rearrangements were made in the process. It's probably best to read the final text and not to try to make sense of the diffs. ........ r50943 | fred.drake | 2006-07-29 20:19:19 +0200 (Sat, 29 Jul 2006) | 1 line restore test un-intentionally removed in the xmlcore purge (revision 50941) ........ r50944 | fred.drake | 2006-07-29 20:33:29 +0200 (Sat, 29 Jul 2006) | 3 lines make the reference to older versions of the documentation a link to the right page on python.org ........ r50945 | fred.drake | 2006-07-29 21:09:01 +0200 (Sat, 29 Jul 2006) | 1 line document the footnote usage pattern ........ r50947 | fred.drake | 2006-07-29 21:14:10 +0200 (Sat, 29 Jul 2006) | 1 line emphasize and oddball nuance of LaTeX comment syntax ........ r50948 | andrew.kuchling | 2006-07-29 21:24:04 +0200 (Sat, 29 Jul 2006) | 1 line [Patch #1490989 from Skip Montanaro] Mention debugging builds in the API documentation. I've changed Skip's patch to point to Misc/SpecialBuilds and fiddled with the markup a bit. ........ r50949 | neal.norwitz | 2006-07-29 21:29:35 +0200 (Sat, 29 Jul 2006) | 6 lines Disable these tests until they are reliable across platforms. These problems may mask more important, real problems. One or both methods are known to fail on: Solaris, OpenBSD, Debian, Ubuntu. They pass on Windows and some Linux boxes. ........ r50950 | andrew.kuchling | 2006-07-29 21:50:37 +0200 (Sat, 29 Jul 2006) | 1 line [Patch #1068277] Clarify that os.path.exists() can return False depending on permissions. Fred approved committing this patch in December 2004! ........ r50952 | fred.drake | 2006-07-29 22:04:42 +0200 (Sat, 29 Jul 2006) | 6 lines SF bug #1193966: Weakref types documentation misplaced The information about supporting weakrefs with types defined in C extensions is moved to the Extending & Embedding manual. Py_TPFLAGS_HAVE_WEAKREFS is no longer mentioned since it is part of Py_TPFLAGS_DEFAULT. ........ r50953 | skip.montanaro | 2006-07-29 22:06:05 +0200 (Sat, 29 Jul 2006) | 4 lines Add a comment to the csv reader documentation that explains why the treatment of newlines changed in 2.5. Pulled almost verbatim from a comment by Andrew McNamara in <http://python.org/sf/1465014>. ........ r50954 | neal.norwitz | 2006-07-29 22:20:52 +0200 (Sat, 29 Jul 2006) | 3 lines If the executable doesn't exist, there's no reason to try to start it. This prevents garbage about command not found being printed on Solaris. ........ r50955 | fred.drake | 2006-07-29 22:21:25 +0200 (Sat, 29 Jul 2006) | 1 line fix minor markup error that introduced extra punctuation ........ r50957 | neal.norwitz | 2006-07-29 22:37:08 +0200 (Sat, 29 Jul 2006) | 3 lines Disable test_getnode too, since this is also unreliable. ........ r50958 | andrew.kuchling | 2006-07-29 23:27:12 +0200 (Sat, 29 Jul 2006) | 1 line Follow TeX's conventions for hyphens ........ r50959 | andrew.kuchling | 2006-07-29 23:30:21 +0200 (Sat, 29 Jul 2006) | 1 line Fix case for 'Unix' ........ r50960 | fred.drake | 2006-07-30 01:34:57 +0200 (Sun, 30 Jul 2006) | 1 line markup cleanups ........ r50961 | andrew.kuchling | 2006-07-30 02:27:34 +0200 (Sun, 30 Jul 2006) | 1 line Minor typo fixes ........ r50962 | andrew.kuchling | 2006-07-30 02:37:56 +0200 (Sun, 30 Jul 2006) | 1 line [Bug #793553] Correct description of keyword arguments for SSL authentication ........ r50963 | tim.peters | 2006-07-30 02:58:15 +0200 (Sun, 30 Jul 2006) | 2 lines Whitespace normalization. ........ r50964 | fred.drake | 2006-07-30 05:03:43 +0200 (Sun, 30 Jul 2006) | 1 line lots of markup nits, most commonly Unix/unix --> \UNIX ........ r50965 | fred.drake | 2006-07-30 07:41:28 +0200 (Sun, 30 Jul 2006) | 1 line update information on wxPython, from Robin Dunn ........ r50966 | fred.drake | 2006-07-30 07:49:49 +0200 (Sun, 30 Jul 2006) | 4 lines remove possibly-outdated comment on what GUI toolkit is most commonly used; it is hard to know whether this is right, and it does not add valuable reference information at any rate ........ r50967 | fred.drake | 2006-07-30 07:55:39 +0200 (Sun, 30 Jul 2006) | 3 lines - remove yet another reference to how commonly Tkinter is (thought to be) used - fix an internal section reference ........ r50968 | neal.norwitz | 2006-07-30 08:53:31 +0200 (Sun, 30 Jul 2006) | 4 lines Patch #1531113: Fix augmented assignment with yield expressions. Also fix a SystemError when trying to assign to yield expressions. ........ r50969 | neal.norwitz | 2006-07-30 08:55:48 +0200 (Sun, 30 Jul 2006) | 5 lines Add PyErr_WarnEx() so C code can pass the stacklevel to warnings.warn(). This provides the proper warning for struct.pack(). PyErr_Warn() is now deprecated in favor of PyErr_WarnEx(). As mentioned by Tim Peters on python-dev. ........ r50970 | neal.norwitz | 2006-07-30 08:57:04 +0200 (Sun, 30 Jul 2006) | 3 lines Bug #1515471: string.replace() accepts character buffers again. Pass the char* and size around rather than PyObject's. ........ r50971 | neal.norwitz | 2006-07-30 08:59:13 +0200 (Sun, 30 Jul 2006) | 1 line Whitespace normalization ........ r50973 | georg.brandl | 2006-07-30 12:53:32 +0200 (Sun, 30 Jul 2006) | 3 lines Clarify that __op__ methods must return NotImplemented if they don't support the operation. ........ r50974 | georg.brandl | 2006-07-30 13:07:23 +0200 (Sun, 30 Jul 2006) | 3 lines Bug #1002398: The documentation for os.path.sameopenfile now correctly refers to file descriptors, not file objects. ........ r50977 | martin.v.loewis | 2006-07-30 15:00:31 +0200 (Sun, 30 Jul 2006) | 3 lines Don't copy directory stat times in shutil.copytree on Windows Fixes #1525866. ........ r50978 | martin.v.loewis | 2006-07-30 15:14:05 +0200 (Sun, 30 Jul 2006) | 3 lines Base __version__ on sys.version_info, as distutils is no longer maintained separatedly. ........ r50979 | martin.v.loewis | 2006-07-30 15:27:31 +0200 (Sun, 30 Jul 2006) | 3 lines Mention Cygwin in distutils error message about a missing VS 2003. Fixes #1257728. ........ r50982 | martin.v.loewis | 2006-07-30 16:09:47 +0200 (Sun, 30 Jul 2006) | 5 lines Drop usage of test -e in configure as it is not portable. Fixes #1439538 Will backport to 2.4 Also regenerate pyconfig.h.in. ........ r50984 | georg.brandl | 2006-07-30 18:20:10 +0200 (Sun, 30 Jul 2006) | 3 lines Fix makefile changes for python-config. ........ r50985 | george.yoshida | 2006-07-30 18:37:37 +0200 (Sun, 30 Jul 2006) | 2 lines Rename struct.pack_to to struct.pack_into as changed in revision 46642. ........ r50986 | george.yoshida | 2006-07-30 18:41:30 +0200 (Sun, 30 Jul 2006) | 2 lines Typo fix ........ r50987 | neal.norwitz | 2006-07-30 21:18:13 +0200 (Sun, 30 Jul 2006) | 1 line Add some asserts and update comments ........ r50988 | neal.norwitz | 2006-07-30 21:18:38 +0200 (Sun, 30 Jul 2006) | 1 line Verify that the signal handlers were really called ........ r50989 | neal.norwitz | 2006-07-30 21:20:42 +0200 (Sun, 30 Jul 2006) | 3 lines Try to prevent hangs on Tru64/Alpha buildbot. I'm not certain this will help and may need to be reverted if it causes problems. ........ r50990 | georg.brandl | 2006-07-30 22:18:51 +0200 (Sun, 30 Jul 2006) | 2 lines Bug #1531349: right <-> left glitch in __rop__ description. ........ r50992 | tim.peters | 2006-07-31 03:46:03 +0200 (Mon, 31 Jul 2006) | 2 lines Whitespace normalization. ........ r50993 | andrew.mcnamara | 2006-07-31 04:27:48 +0200 (Mon, 31 Jul 2006) | 2 lines Redo the comment about the 2.5 change in quoted-newline handling. ........ r50994 | tim.peters | 2006-07-31 04:40:23 +0200 (Mon, 31 Jul 2006) | 10 lines ZipFile.close(): Killed one of the struct.pack deprecation warnings on Win32. Also added an XXX about the line: pos3 = self.fp.tell() `pos3` is never referenced, and I have no idea what the code intended to do instead. ........ r50996 | tim.peters | 2006-07-31 04:53:03 +0200 (Mon, 31 Jul 2006) | 8 lines ZipFile.close(): Kill the other struct.pack deprecation warning on Windows. Afraid I can't detect a pattern to when the pack formats decide to use a signed or unsigned format code -- appears nearly arbitrary to my eyes. So I left all the pack formats alone and changed the special-case data values instead. ........ r50997 | skip.montanaro | 2006-07-31 05:09:45 +0200 (Mon, 31 Jul 2006) | 1 line minor tweaks ........ r50998 | skip.montanaro | 2006-07-31 05:11:11 +0200 (Mon, 31 Jul 2006) | 1 line minor tweaks ........ r50999 | andrew.kuchling | 2006-07-31 14:20:24 +0200 (Mon, 31 Jul 2006) | 1 line Add refcounts for PyErr_WarnEx ........ r51000 | andrew.kuchling | 2006-07-31 14:39:05 +0200 (Mon, 31 Jul 2006) | 9 lines Document PyErr_WarnEx. (Bad Neal! No biscuit!) Is the explanation of the 'stacklevel' parameter clear? Please feel free to edit it. I don't have LaTeX installed on this machine, so haven't verified that the markup is correct. Will check tonight, or maybe the automatic doc build will tell me. ........ r51001 | andrew.kuchling | 2006-07-31 14:52:26 +0200 (Mon, 31 Jul 2006) | 1 line Add PyErr_WarnEx() ........ r51002 | andrew.kuchling | 2006-07-31 15:18:27 +0200 (Mon, 31 Jul 2006) | 1 line Mention csv newline changes ........ r51003 | andrew.kuchling | 2006-07-31 17:22:58 +0200 (Mon, 31 Jul 2006) | 1 line Typo fix ........ r51004 | andrew.kuchling | 2006-07-31 17:23:43 +0200 (Mon, 31 Jul 2006) | 1 line Remove reference to notation ........ r51005 | georg.brandl | 2006-07-31 18:00:34 +0200 (Mon, 31 Jul 2006) | 3 lines Fix function name. ........ r51006 | andrew.kuchling | 2006-07-31 18:10:24 +0200 (Mon, 31 Jul 2006) | 1 line [Bug #1514540] Instead of putting the standard types in a section, put them in a chapter of their own. This means string methods will now show up in the ToC. (Should the types come before or after the functions+exceptions+constants chapter? I've put them after, for now.) ........ r51007 | andrew.kuchling | 2006-07-31 18:22:05 +0200 (Mon, 31 Jul 2006) | 1 line [Bug #848556] Remove \d* from second alternative to avoid exponential case when repeating match ........ r51008 | andrew.kuchling | 2006-07-31 18:27:57 +0200 (Mon, 31 Jul 2006) | 1 line Update list of files; fix a typo ........ r51013 | andrew.kuchling | 2006-08-01 18:24:30 +0200 (Tue, 01 Aug 2006) | 1 line typo fix ........ r51018 | thomas.heller | 2006-08-01 18:54:43 +0200 (Tue, 01 Aug 2006) | 2 lines Fix a potential segfault and various potentail refcount leaks in the cast() function. ........ r51020 | thomas.heller | 2006-08-01 19:46:10 +0200 (Tue, 01 Aug 2006) | 1 line Minimal useful docstring for CopyComPointer. ........ r51021 | andrew.kuchling | 2006-08-01 20:16:15 +0200 (Tue, 01 Aug 2006) | 8 lines [Patch #1520905] Attempt to suppress core file created by test_subprocess.py. Patch by Douglas Greiman. The test_run_abort() testcase produces a core file on Unix systems, even though the test is successful. This can be confusing or alarming to someone who runs 'make test' and then finds that the Python interpreter apparently crashed. ........ r51023 | georg.brandl | 2006-08-01 20:49:24 +0200 (Tue, 01 Aug 2006) | 3 lines os.urandom no longer masks unrelated exceptions like SystemExit or KeyboardInterrupt. ........ r51025 | thomas.heller | 2006-08-01 21:14:15 +0200 (Tue, 01 Aug 2006) | 2 lines Speed up PyType_stgdict and PyObject_stgdict. ........ r51027 | ronald.oussoren | 2006-08-01 22:30:31 +0200 (Tue, 01 Aug 2006) | 3 lines Make sure the postinstall action that optionally updates the user's profile on MacOS X actually works correctly in all cases. ........ r51028 | ronald.oussoren | 2006-08-01 23:00:57 +0200 (Tue, 01 Aug 2006) | 4 lines This fixes bug #1527397: PythonLauncher runs scripts with the wrong working directory. It also fixes a bug where PythonLauncher failed to launch scripts when the scriptname (or the path to the script) contains quotes. ........ r51031 | tim.peters | 2006-08-02 05:27:46 +0200 (Wed, 02 Aug 2006) | 2 lines Whitespace normalization. ........ r51032 | tim.peters | 2006-08-02 06:12:36 +0200 (Wed, 02 Aug 2006) | 19 lines Try to squash struct.pack warnings on the "amd64 gentoo trunk" buildbot (& possibly other 64-bit boxes) during test_gzip. The native zlib crc32 function returns an unsigned 32-bit integer, which the Python wrapper implicitly casts to C long. Therefore the same crc can "look negative" on a 32-bit box but "look positive" on a 64-bit box. This patch papers over that platform difference when writing the crc to file. It may be better to change the Python wrapper, either to make the result "look positive" on all platforms (which means it may have to return a Python long at times on a 32-bit box), or to keep the sign the same across boxes. But that would be a visible change in what users see, while the current hack changes no visible behavior (well, apart from stopping the struct deprecation warning). Note that the module-level write32() function is no longer used. ........ r51033 | neal.norwitz | 2006-08-02 06:27:11 +0200 (Wed, 02 Aug 2006) | 4 lines Prevent memory leak on error. Reported by Klocwork #36 ........ r51034 | tim.peters | 2006-08-02 07:20:08 +0200 (Wed, 02 Aug 2006) | 9 lines _Stream.close(): Try to kill struct.pack() warnings when writing the crc to file on the "PPC64 Debian trunk" buildbot when running test_tarfile. This is again a case where the native zlib crc is an unsigned 32-bit int, but the Python wrapper implicitly casts it to signed C long, so that "the sign bit looks different" on different platforms. ........ r51035 | ronald.oussoren | 2006-08-02 08:10:10 +0200 (Wed, 02 Aug 2006) | 2 lines Updated documentation for the script that builds the OSX installer. ........ r51036 | neal.norwitz | 2006-08-02 08:14:22 +0200 (Wed, 02 Aug 2006) | 2 lines _PyWeakref_GetWeakrefCount() now returns a Py_ssize_t instead of long. ........ r51037 | neal.norwitz | 2006-08-02 08:15:10 +0200 (Wed, 02 Aug 2006) | 1 line v is already checked for NULL, so just DECREF it ........ r51038 | neal.norwitz | 2006-08-02 08:19:19 +0200 (Wed, 02 Aug 2006) | 1 line Let us know when there was a problem and the child had to kill the parent ........ r51039 | neal.norwitz | 2006-08-02 08:46:21 +0200 (Wed, 02 Aug 2006) | 5 lines Patch #1519025 and bug #926423: If a KeyboardInterrupt occurs during a socket operation on a socket with a timeout, the exception will be caught correctly. Previously, the exception was not caught. ........ r51040 | neal.norwitz | 2006-08-02 09:09:32 +0200 (Wed, 02 Aug 2006) | 1 line Add some explanation about Klocwork and Coverity static analysis ........ r51041 | anthony.baxter | 2006-08-02 09:43:09 +0200 (Wed, 02 Aug 2006) | 1 line pre-release machinations ........ r51043 | thomas.heller | 2006-08-02 13:35:31 +0200 (Wed, 02 Aug 2006) | 4 lines A few nore words about what ctypes does. Document that using the wrong calling convention can also raise 'ValueError: Procedure called with the wrong number of arguments'. ........ r51045 | thomas.heller | 2006-08-02 14:00:13 +0200 (Wed, 02 Aug 2006) | 1 line Fix a mistake. ........ r51046 | martin.v.loewis | 2006-08-02 15:53:55 +0200 (Wed, 02 Aug 2006) | 3 lines Correction of patch #1455898: In the mbcs decoder, set final=False for stream decoder, but final=True for the decode function. ........ r51049 | tim.peters | 2006-08-02 20:19:35 +0200 (Wed, 02 Aug 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51079 | neal.norwitz | 2006-08-04 06:50:21 +0200 (Fri, 04 Aug 2006) | 3 lines Bug #1531405, format_exception no longer raises an exception if str(exception) raised an exception. ........ r51080 | neal.norwitz | 2006-08-04 06:58:47 +0200 (Fri, 04 Aug 2006) | 11 lines Bug #1191458: tracing over for loops now produces a line event on each iteration. I'm not positive this is the best way to handle this. I'm also not sure that there aren't other cases where the lnotab is generated incorrectly. It would be great if people that use pdb or tracing could test heavily. Also: * Remove dead/duplicated code that wasn't used/necessary because we already handled the docstring prior to entering the loop. * add some debugging code into the compiler (#if 0'd out). ........ r51081 | neal.norwitz | 2006-08-04 07:09:28 +0200 (Fri, 04 Aug 2006) | 4 lines Bug #1333982: string/number constants were inappropriately stored in the byte code and co_consts even if they were not used, ie immediately popped off the stack. ........ r51082 | neal.norwitz | 2006-08-04 07:12:19 +0200 (Fri, 04 Aug 2006) | 1 line There were really two issues ........ r51084 | fred.drake | 2006-08-04 07:17:21 +0200 (Fri, 04 Aug 2006) | 1 line SF patch #1534048 (bug #1531003): fix typo in error message ........ r51085 | gregory.p.smith | 2006-08-04 07:17:47 +0200 (Fri, 04 Aug 2006) | 3 lines fix typos ........ r51087 | georg.brandl | 2006-08-04 08:03:53 +0200 (Fri, 04 Aug 2006) | 3 lines Fix bug caused by first decrefing, then increfing. ........ r51109 | neil.schemenauer | 2006-08-04 18:20:30 +0200 (Fri, 04 Aug 2006) | 5 lines Fix the 'compiler' package to generate correct code for MAKE_CLOSURE. In the 2.5 development cycle, MAKE_CLOSURE as changed to take free variables as a tuple rather than as individual items on the stack. Closes patch #1534084. ........ r51110 | georg.brandl | 2006-08-04 20:03:37 +0200 (Fri, 04 Aug 2006) | 3 lines Change fix for segfaulting property(), add a NEWS entry and a test. ........ r51111 | georg.brandl | 2006-08-04 20:07:34 +0200 (Fri, 04 Aug 2006) | 3 lines Better fix for bug #1531405, not executing str(value) twice. ........ r51112 | thomas.heller | 2006-08-04 20:17:40 +0200 (Fri, 04 Aug 2006) | 1 line On Windows, make PyErr_Warn an exported function again. ........ r51113 | thomas.heller | 2006-08-04 20:57:34 +0200 (Fri, 04 Aug 2006) | 4 lines Fix #1530448 - fix ctypes build failure on solaris 10. The '-mimpure-text' linker flag is required when linking _ctypes.so. ........ r51114 | thomas.heller | 2006-08-04 21:49:31 +0200 (Fri, 04 Aug 2006) | 3 lines Fix #1534738: win32 debug version of _msi must be _msi_d.pyd, not _msi.pyd. Fix the name of the pdb file as well. ........ r51115 | andrew.kuchling | 2006-08-04 22:37:43 +0200 (Fri, 04 Aug 2006) | 1 line Typo fixes ........ r51116 | andrew.kuchling | 2006-08-04 23:10:03 +0200 (Fri, 04 Aug 2006) | 1 line Fix mangled sentence ........ r51118 | tim.peters | 2006-08-05 00:00:35 +0200 (Sat, 05 Aug 2006) | 2 lines Whitespace normalization. ........ r51119 | bob.ippolito | 2006-08-05 01:59:21 +0200 (Sat, 05 Aug 2006) | 5 lines Fix #1530559, struct.pack raises TypeError where it used to convert. Passing float arguments to struct.pack when integers are expected now triggers a DeprecationWarning. ........ r51123 | georg.brandl | 2006-08-05 08:10:54 +0200 (Sat, 05 Aug 2006) | 3 lines Patch #1534922: correct and enhance unittest docs. ........ r51126 | georg.brandl | 2006-08-06 09:06:33 +0200 (Sun, 06 Aug 2006) | 2 lines Bug #1535182: really test the xreadlines() method of bz2 objects. ........ r51128 | georg.brandl | 2006-08-06 09:26:21 +0200 (Sun, 06 Aug 2006) | 4 lines Bug #1535081: A leading underscore has been added to the names of the md5 and sha modules, so add it in Modules/Setup.dist too. ........ r51129 | georg.brandl | 2006-08-06 10:23:54 +0200 (Sun, 06 Aug 2006) | 3 lines Bug #1535165: fixed a segfault in input() and raw_input() when sys.stdin is closed. ........ r51131 | georg.brandl | 2006-08-06 11:17:16 +0200 (Sun, 06 Aug 2006) | 2 lines Don't produce output in test_builtin. ........ r51133 | andrew.macintyre | 2006-08-06 14:37:03 +0200 (Sun, 06 Aug 2006) | 4 lines test_threading now skips testing alternate thread stack sizes on platforms that don't support changing thread stack size. ........ r51134 | andrew.kuchling | 2006-08-07 00:07:04 +0200 (Mon, 07 Aug 2006) | 2 lines [Patch #1464056] Ensure that we use the panelw library when linking with ncursesw. Once I see how the buildbots react, I'll backport this to 2.4. ........ r51137 | georg.brandl | 2006-08-08 13:52:34 +0200 (Tue, 08 Aug 2006) | 3 lines webbrowser: Silence stderr output if no gconftool or gnome browser found ........ r51138 | georg.brandl | 2006-08-08 13:56:21 +0200 (Tue, 08 Aug 2006) | 7 lines Remove "non-mapping" and "non-sequence" from TypeErrors raised by PyMapping_Size and PySequence_Size. Because len() tries first sequence, then mapping size, it will always raise a "non-mapping object has no len" error which is confusing. ........ r51139 | thomas.heller | 2006-08-08 19:37:00 +0200 (Tue, 08 Aug 2006) | 3 lines memcmp() can return values other than -1, 0, and +1 but tp_compare must not. ........ r51140 | thomas.heller | 2006-08-08 19:39:20 +0200 (Tue, 08 Aug 2006) | 1 line Remove accidently committed, duplicated test. ........ r51147 | andrew.kuchling | 2006-08-08 20:50:14 +0200 (Tue, 08 Aug 2006) | 1 line Reword paragraph to clarify ........ r51148 | andrew.kuchling | 2006-08-08 20:56:08 +0200 (Tue, 08 Aug 2006) | 1 line Move obmalloc item into C API section ........ r51149 | andrew.kuchling | 2006-08-08 21:00:14 +0200 (Tue, 08 Aug 2006) | 1 line 'Other changes' section now has only one item; move the item elsewhere and remove the section ........ r51150 | andrew.kuchling | 2006-08-08 21:00:34 +0200 (Tue, 08 Aug 2006) | 1 line Bump version number ........ r51151 | georg.brandl | 2006-08-08 22:11:22 +0200 (Tue, 08 Aug 2006) | 2 lines Bug #1536828: typo: TypeType should have been StringType. ........ r51153 | georg.brandl | 2006-08-08 22:13:13 +0200 (Tue, 08 Aug 2006) | 2 lines Bug #1536660: separate two words. ........ r51155 | georg.brandl | 2006-08-08 22:48:10 +0200 (Tue, 08 Aug 2006) | 3 lines ``str`` is now the same object as ``types.StringType``. ........ r51156 | tim.peters | 2006-08-09 02:52:26 +0200 (Wed, 09 Aug 2006) | 2 lines Whitespace normalization. ........ r51158 | georg.brandl | 2006-08-09 09:03:22 +0200 (Wed, 09 Aug 2006) | 4 lines Introduce an upper bound on tuple nesting depth in C argument format strings; fixes rest of #1523610. ........ r51160 | martin.v.loewis | 2006-08-09 09:57:39 +0200 (Wed, 09 Aug 2006) | 4 lines __hash__ may now return long int; the final hash value is obtained by invoking hash on the long int. Fixes #1536021. ........ r51168 | andrew.kuchling | 2006-08-09 15:03:41 +0200 (Wed, 09 Aug 2006) | 1 line [Bug #1536021] Mention __hash__ change ........ r51169 | andrew.kuchling | 2006-08-09 15:57:05 +0200 (Wed, 09 Aug 2006) | 1 line [Patch #1534027] Add notes on locale module changes ........ r51170 | andrew.kuchling | 2006-08-09 16:05:35 +0200 (Wed, 09 Aug 2006) | 1 line Add missing 'self' parameters ........ r51171 | andrew.kuchling | 2006-08-09 16:06:19 +0200 (Wed, 09 Aug 2006) | 1 line Reindent code ........ r51172 | armin.rigo | 2006-08-09 16:55:26 +0200 (Wed, 09 Aug 2006) | 2 lines Fix and test for an infinite C recursion. ........ r51173 | ronald.oussoren | 2006-08-09 16:56:33 +0200 (Wed, 09 Aug 2006) | 2 lines It's unlikely that future versions will require _POSIX_C_SOURCE ........ r51178 | armin.rigo | 2006-08-09 17:37:26 +0200 (Wed, 09 Aug 2006) | 2 lines Concatenation on a long string breaks (SF #1526585). ........ r51180 | kurt.kaiser | 2006-08-09 18:46:15 +0200 (Wed, 09 Aug 2006) | 8 lines 1. When used w/o subprocess, all exceptions were preceeded by an error message claiming they were IDLE internal errors (since 1.2a1). 2. Add Ronald Oussoren to CREDITS M NEWS.txt M PyShell.py M CREDITS.txt ........ r51181 | kurt.kaiser | 2006-08-09 19:47:15 +0200 (Wed, 09 Aug 2006) | 4 lines As a slight enhancement to the previous checkin, improve the internal error reporting by moving message to IDLE console. ........ r51182 | andrew.kuchling | 2006-08-09 20:23:14 +0200 (Wed, 09 Aug 2006) | 1 line Typo fix ........ r51183 | kurt.kaiser | 2006-08-09 22:34:46 +0200 (Wed, 09 Aug 2006) | 2 lines ToggleTab dialog was setting indent to 8 even if cancelled (since 1.2a1). ........ r51184 | martin.v.loewis | 2006-08-10 01:42:18 +0200 (Thu, 10 Aug 2006) | 2 lines Add some commentary on -mimpure-text. ........ r51185 | tim.peters | 2006-08-10 02:58:49 +0200 (Thu, 10 Aug 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51186 | kurt.kaiser | 2006-08-10 03:41:17 +0200 (Thu, 10 Aug 2006) | 2 lines Changing tokenize (39046) to detect dedent broke tabnanny check (since 1.2a1) ........ r51187 | tim.peters | 2006-08-10 05:01:26 +0200 (Thu, 10 Aug 2006) | 13 lines test_copytree_simple(): This was leaving behind two new temp directories each time it ran, at least on Windows. Several changes: explicitly closed all files; wrapped long lines; stopped suppressing errors when removing a file or directory fails (removing /shouldn't/ fail!); and changed what appeared to be incorrect usage of os.removedirs() (that doesn't remove empty directories at and /under/ the given path, instead it must be given an empty leaf directory and then deletes empty directories moving /up/ the path -- could be that the conceptually simpler shutil.rmtree() was really actually intended here). ........
5092 lines
126 KiB
C
5092 lines
126 KiB
C
/* Socket module */
|
|
|
|
/*
|
|
|
|
This module provides an interface to Berkeley socket IPC.
|
|
|
|
Limitations:
|
|
|
|
- Only AF_INET, AF_INET6 and AF_UNIX address families are supported in a
|
|
portable manner, though AF_PACKET and AF_NETLINK are supported under Linux.
|
|
- No read/write operations (use sendall/recv or makefile instead).
|
|
- Additional restrictions apply on some non-Unix platforms (compensated
|
|
for by socket.py).
|
|
|
|
Module interface:
|
|
|
|
- socket.error: exception raised for socket specific errors
|
|
- socket.gaierror: exception raised for getaddrinfo/getnameinfo errors,
|
|
a subclass of socket.error
|
|
- socket.herror: exception raised for gethostby* errors,
|
|
a subclass of socket.error
|
|
- socket.fromfd(fd, family, type[, proto]) --> new socket object (created
|
|
from an existing file descriptor)
|
|
- socket.gethostbyname(hostname) --> host IP address (string: 'dd.dd.dd.dd')
|
|
- socket.gethostbyaddr(IP address) --> (hostname, [alias, ...], [IP addr, ...])
|
|
- socket.gethostname() --> host name (string: 'spam' or 'spam.domain.com')
|
|
- socket.getprotobyname(protocolname) --> protocol number
|
|
- socket.getservbyname(servicename[, protocolname]) --> port number
|
|
- socket.getservbyport(portnumber[, protocolname]) --> service name
|
|
- socket.socket([family[, type [, proto]]]) --> new socket object
|
|
- socket.socketpair([family[, type [, proto]]]) --> (socket, socket)
|
|
- socket.ntohs(16 bit value) --> new int object
|
|
- socket.ntohl(32 bit value) --> new int object
|
|
- socket.htons(16 bit value) --> new int object
|
|
- socket.htonl(32 bit value) --> new int object
|
|
- socket.getaddrinfo(host, port [, family, socktype, proto, flags])
|
|
--> List of (family, socktype, proto, canonname, sockaddr)
|
|
- socket.getnameinfo(sockaddr, flags) --> (host, port)
|
|
- socket.AF_INET, socket.SOCK_STREAM, etc.: constants from <socket.h>
|
|
- socket.has_ipv6: boolean value indicating if IPv6 is supported
|
|
- socket.inet_aton(IP address) -> 32-bit packed IP representation
|
|
- socket.inet_ntoa(packed IP) -> IP address string
|
|
- socket.getdefaulttimeout() -> None | float
|
|
- socket.setdefaulttimeout(None | float)
|
|
- an Internet socket address is a pair (hostname, port)
|
|
where hostname can be anything recognized by gethostbyname()
|
|
(including the dd.dd.dd.dd notation) and port is in host byte order
|
|
- where a hostname is returned, the dd.dd.dd.dd notation is used
|
|
- a UNIX domain socket address is a string specifying the pathname
|
|
- an AF_PACKET socket address is a tuple containing a string
|
|
specifying the ethernet interface and an integer specifying
|
|
the Ethernet protocol number to be received. For example:
|
|
("eth0",0x1234). Optional 3rd,4th,5th elements in the tuple
|
|
specify packet-type and ha-type/addr.
|
|
|
|
Local naming conventions:
|
|
|
|
- names starting with sock_ are socket object methods
|
|
- names starting with socket_ are module-level functions
|
|
- names starting with PySocket are exported through socketmodule.h
|
|
|
|
*/
|
|
|
|
#ifdef __APPLE__
|
|
/*
|
|
* inet_aton is not available on OSX 10.3, yet we want to use a binary
|
|
* that was build on 10.4 or later to work on that release, weak linking
|
|
* comes to the rescue.
|
|
*/
|
|
# pragma weak inet_aton
|
|
#endif
|
|
|
|
#include "Python.h"
|
|
#include "structmember.h"
|
|
|
|
#undef MAX
|
|
#define MAX(x, y) ((x) < (y) ? (y) : (x))
|
|
|
|
/* Socket object documentation */
|
|
PyDoc_STRVAR(sock_doc,
|
|
"socket([family[, type[, proto]]]) -> socket object\n\
|
|
\n\
|
|
Open a socket of the given type. The family argument specifies the\n\
|
|
address family; it defaults to AF_INET. The type argument specifies\n\
|
|
whether this is a stream (SOCK_STREAM, this is the default)\n\
|
|
or datagram (SOCK_DGRAM) socket. The protocol argument defaults to 0,\n\
|
|
specifying the default protocol. Keyword arguments are accepted.\n\
|
|
\n\
|
|
A socket object represents one endpoint of a network connection.\n\
|
|
\n\
|
|
Methods of socket objects (keyword arguments not allowed):\n\
|
|
\n\
|
|
accept() -- accept a connection, returning new socket and client address\n\
|
|
bind(addr) -- bind the socket to a local address\n\
|
|
close() -- close the socket\n\
|
|
connect(addr) -- connect the socket to a remote address\n\
|
|
connect_ex(addr) -- connect, return an error code instead of an exception\n\
|
|
dup() -- return a new socket object identical to the current one [*]\n\
|
|
fileno() -- return underlying file descriptor\n\
|
|
getpeername() -- return remote address [*]\n\
|
|
getsockname() -- return local address\n\
|
|
getsockopt(level, optname[, buflen]) -- get socket options\n\
|
|
gettimeout() -- return timeout or None\n\
|
|
listen(n) -- start listening for incoming connections\n\
|
|
makefile([mode, [bufsize]]) -- return a file object for the socket [*]\n\
|
|
recv(buflen[, flags]) -- receive data\n\
|
|
recv_into(buffer[, nbytes[, flags]]) -- receive data (into a buffer)\n\
|
|
recvfrom(buflen[, flags]) -- receive data and sender\'s address\n\
|
|
recvfrom_into(buffer[, nbytes, [, flags])\n\
|
|
-- receive data and sender\'s address (into a buffer)\n\
|
|
sendall(data[, flags]) -- send all data\n\
|
|
send(data[, flags]) -- send data, may not send all of it\n\
|
|
sendto(data[, flags], addr) -- send data to a given address\n\
|
|
setblocking(0 | 1) -- set or clear the blocking I/O flag\n\
|
|
setsockopt(level, optname, value) -- set socket options\n\
|
|
settimeout(None | float) -- set or clear the timeout\n\
|
|
shutdown(how) -- shut down traffic in one or both directions\n\
|
|
\n\
|
|
[*] not available on all platforms!");
|
|
|
|
/* XXX This is a terrible mess of platform-dependent preprocessor hacks.
|
|
I hope some day someone can clean this up please... */
|
|
|
|
/* Hacks for gethostbyname_r(). On some non-Linux platforms, the configure
|
|
script doesn't get this right, so we hardcode some platform checks below.
|
|
On the other hand, not all Linux versions agree, so there the settings
|
|
computed by the configure script are needed! */
|
|
|
|
#ifndef linux
|
|
# undef HAVE_GETHOSTBYNAME_R_3_ARG
|
|
# undef HAVE_GETHOSTBYNAME_R_5_ARG
|
|
# undef HAVE_GETHOSTBYNAME_R_6_ARG
|
|
#endif
|
|
|
|
#ifndef WITH_THREAD
|
|
# undef HAVE_GETHOSTBYNAME_R
|
|
#endif
|
|
|
|
#ifdef HAVE_GETHOSTBYNAME_R
|
|
# if defined(_AIX) || defined(__osf__)
|
|
# define HAVE_GETHOSTBYNAME_R_3_ARG
|
|
# elif defined(__sun) || defined(__sgi)
|
|
# define HAVE_GETHOSTBYNAME_R_5_ARG
|
|
# elif defined(linux)
|
|
/* Rely on the configure script */
|
|
# else
|
|
# undef HAVE_GETHOSTBYNAME_R
|
|
# endif
|
|
#endif
|
|
|
|
#if !defined(HAVE_GETHOSTBYNAME_R) && defined(WITH_THREAD) && \
|
|
!defined(MS_WINDOWS)
|
|
# define USE_GETHOSTBYNAME_LOCK
|
|
#endif
|
|
|
|
/* To use __FreeBSD_version */
|
|
#ifdef HAVE_SYS_PARAM_H
|
|
#include <sys/param.h>
|
|
#endif
|
|
/* On systems on which getaddrinfo() is believed to not be thread-safe,
|
|
(this includes the getaddrinfo emulation) protect access with a lock. */
|
|
#if defined(WITH_THREAD) && (defined(__APPLE__) || \
|
|
(defined(__FreeBSD__) && __FreeBSD_version+0 < 503000) || \
|
|
defined(__OpenBSD__) || defined(__NetBSD__) || \
|
|
defined(__VMS) || !defined(HAVE_GETADDRINFO))
|
|
#define USE_GETADDRINFO_LOCK
|
|
#endif
|
|
|
|
#ifdef USE_GETADDRINFO_LOCK
|
|
#define ACQUIRE_GETADDRINFO_LOCK PyThread_acquire_lock(netdb_lock, 1);
|
|
#define RELEASE_GETADDRINFO_LOCK PyThread_release_lock(netdb_lock);
|
|
#else
|
|
#define ACQUIRE_GETADDRINFO_LOCK
|
|
#define RELEASE_GETADDRINFO_LOCK
|
|
#endif
|
|
|
|
#if defined(USE_GETHOSTBYNAME_LOCK) || defined(USE_GETADDRINFO_LOCK)
|
|
# include "pythread.h"
|
|
#endif
|
|
|
|
#if defined(PYCC_VACPP)
|
|
# include <types.h>
|
|
# include <io.h>
|
|
# include <sys/ioctl.h>
|
|
# include <utils.h>
|
|
# include <ctype.h>
|
|
#endif
|
|
|
|
#if defined(__VMS)
|
|
# include <ioctl.h>
|
|
#endif
|
|
|
|
#if defined(PYOS_OS2)
|
|
# define INCL_DOS
|
|
# define INCL_DOSERRORS
|
|
# define INCL_NOPMAPI
|
|
# include <os2.h>
|
|
#endif
|
|
|
|
#if defined(__sgi) && _COMPILER_VERSION>700 && !_SGIAPI
|
|
/* make sure that the reentrant (gethostbyaddr_r etc)
|
|
functions are declared correctly if compiling with
|
|
MIPSPro 7.x in ANSI C mode (default) */
|
|
|
|
/* XXX Using _SGIAPI is the wrong thing,
|
|
but I don't know what the right thing is. */
|
|
#undef _SGIAPI /* to avoid warning */
|
|
#define _SGIAPI 1
|
|
|
|
#undef _XOPEN_SOURCE
|
|
#include <sys/socket.h>
|
|
#include <sys/types.h>
|
|
#include <netinet/in.h>
|
|
#ifdef _SS_ALIGNSIZE
|
|
#define HAVE_GETADDRINFO 1
|
|
#define HAVE_GETNAMEINFO 1
|
|
#endif
|
|
|
|
#define HAVE_INET_PTON
|
|
#include <netdb.h>
|
|
#endif
|
|
|
|
/* Irix 6.5 fails to define this variable at all. This is needed
|
|
for both GCC and SGI's compiler. I'd say that the SGI headers
|
|
are just busted. Same thing for Solaris. */
|
|
#if (defined(__sgi) || defined(sun)) && !defined(INET_ADDRSTRLEN)
|
|
#define INET_ADDRSTRLEN 16
|
|
#endif
|
|
|
|
/* Generic includes */
|
|
#ifdef HAVE_SYS_TYPES_H
|
|
#include <sys/types.h>
|
|
#endif
|
|
|
|
/* Generic socket object definitions and includes */
|
|
#define PySocket_BUILDING_SOCKET
|
|
#include "socketmodule.h"
|
|
|
|
/* Addressing includes */
|
|
|
|
#ifndef MS_WINDOWS
|
|
|
|
/* Non-MS WINDOWS includes */
|
|
# include <netdb.h>
|
|
|
|
/* Headers needed for inet_ntoa() and inet_addr() */
|
|
# ifdef __BEOS__
|
|
# include <net/netdb.h>
|
|
# elif defined(PYOS_OS2) && defined(PYCC_VACPP)
|
|
# include <netdb.h>
|
|
typedef size_t socklen_t;
|
|
# else
|
|
# include <arpa/inet.h>
|
|
# endif
|
|
|
|
# ifndef RISCOS
|
|
# include <fcntl.h>
|
|
# else
|
|
# include <sys/ioctl.h>
|
|
# include <socklib.h>
|
|
# define NO_DUP
|
|
int h_errno; /* not used */
|
|
# define INET_ADDRSTRLEN 16
|
|
# endif
|
|
|
|
#else
|
|
|
|
/* MS_WINDOWS includes */
|
|
# ifdef HAVE_FCNTL_H
|
|
# include <fcntl.h>
|
|
# endif
|
|
|
|
#endif
|
|
|
|
#include <stddef.h>
|
|
|
|
#ifndef offsetof
|
|
# define offsetof(type, member) ((size_t)(&((type *)0)->member))
|
|
#endif
|
|
|
|
#ifndef O_NONBLOCK
|
|
# define O_NONBLOCK O_NDELAY
|
|
#endif
|
|
|
|
/* include Python's addrinfo.h unless it causes trouble */
|
|
#if defined(__sgi) && _COMPILER_VERSION>700 && defined(_SS_ALIGNSIZE)
|
|
/* Do not include addinfo.h on some newer IRIX versions.
|
|
* _SS_ALIGNSIZE is defined in sys/socket.h by 6.5.21,
|
|
* for example, but not by 6.5.10.
|
|
*/
|
|
#elif defined(_MSC_VER) && _MSC_VER>1201
|
|
/* Do not include addrinfo.h for MSVC7 or greater. 'addrinfo' and
|
|
* EAI_* constants are defined in (the already included) ws2tcpip.h.
|
|
*/
|
|
#else
|
|
# include "addrinfo.h"
|
|
#endif
|
|
|
|
#ifndef HAVE_INET_PTON
|
|
int inet_pton(int af, const char *src, void *dst);
|
|
const char *inet_ntop(int af, const void *src, char *dst, socklen_t size);
|
|
#endif
|
|
|
|
#ifdef __APPLE__
|
|
/* On OS X, getaddrinfo returns no error indication of lookup
|
|
failure, so we must use the emulation instead of the libinfo
|
|
implementation. Unfortunately, performing an autoconf test
|
|
for this bug would require DNS access for the machine performing
|
|
the configuration, which is not acceptable. Therefore, we
|
|
determine the bug just by checking for __APPLE__. If this bug
|
|
gets ever fixed, perhaps checking for sys/version.h would be
|
|
appropriate, which is 10/0 on the system with the bug. */
|
|
#ifndef HAVE_GETNAMEINFO
|
|
/* This bug seems to be fixed in Jaguar. Ths easiest way I could
|
|
Find to check for Jaguar is that it has getnameinfo(), which
|
|
older releases don't have */
|
|
#undef HAVE_GETADDRINFO
|
|
#endif
|
|
|
|
#ifdef HAVE_INET_ATON
|
|
#define USE_INET_ATON_WEAKLINK
|
|
#endif
|
|
|
|
#endif
|
|
|
|
/* I know this is a bad practice, but it is the easiest... */
|
|
#if !defined(HAVE_GETADDRINFO)
|
|
/* avoid clashes with the C library definition of the symbol. */
|
|
#define getaddrinfo fake_getaddrinfo
|
|
#define gai_strerror fake_gai_strerror
|
|
#define freeaddrinfo fake_freeaddrinfo
|
|
#include "getaddrinfo.c"
|
|
#endif
|
|
#if !defined(HAVE_GETNAMEINFO)
|
|
#define getnameinfo fake_getnameinfo
|
|
#include "getnameinfo.c"
|
|
#endif
|
|
|
|
#if defined(MS_WINDOWS) || defined(__BEOS__)
|
|
/* BeOS suffers from the same socket dichotomy as Win32... - [cjh] */
|
|
/* seem to be a few differences in the API */
|
|
#define SOCKETCLOSE closesocket
|
|
#define NO_DUP /* Actually it exists on NT 3.5, but what the heck... */
|
|
#endif
|
|
|
|
#ifdef MS_WIN32
|
|
#define EAFNOSUPPORT WSAEAFNOSUPPORT
|
|
#define snprintf _snprintf
|
|
#endif
|
|
|
|
#if defined(PYOS_OS2) && !defined(PYCC_GCC)
|
|
#define SOCKETCLOSE soclose
|
|
#define NO_DUP /* Sockets are Not Actual File Handles under OS/2 */
|
|
#endif
|
|
|
|
#ifndef SOCKETCLOSE
|
|
#define SOCKETCLOSE close
|
|
#endif
|
|
|
|
#if defined(HAVE_BLUETOOTH_H) || defined(HAVE_BLUETOOTH_BLUETOOTH_H)
|
|
#define USE_BLUETOOTH 1
|
|
#if defined(__FreeBSD__)
|
|
#define BTPROTO_L2CAP BLUETOOTH_PROTO_L2CAP
|
|
#define BTPROTO_RFCOMM BLUETOOTH_PROTO_RFCOMM
|
|
#define sockaddr_l2 sockaddr_l2cap
|
|
#define sockaddr_rc sockaddr_rfcomm
|
|
#define _BT_SOCKADDR_MEMB(s, proto) &((s)->sock_addr)
|
|
#define _BT_L2_MEMB(sa, memb) ((sa)->l2cap_##memb)
|
|
#define _BT_RC_MEMB(sa, memb) ((sa)->rfcomm_##memb)
|
|
#elif defined(__NetBSD__)
|
|
#define sockaddr_l2 sockaddr_bt
|
|
#define sockaddr_rc sockaddr_bt
|
|
#define sockaddr_sco sockaddr_bt
|
|
#define _BT_SOCKADDR_MEMB(s, proto) &((s)->sock_addr)
|
|
#define _BT_L2_MEMB(sa, memb) ((sa)->bt_##memb)
|
|
#define _BT_RC_MEMB(sa, memb) ((sa)->bt_##memb)
|
|
#define _BT_SCO_MEMB(sa, memb) ((sa)->bt_##memb)
|
|
#else
|
|
#define _BT_SOCKADDR_MEMB(s, proto) (&((s)->sock_addr).bt_##proto)
|
|
#define _BT_L2_MEMB(sa, memb) ((sa)->l2_##memb)
|
|
#define _BT_RC_MEMB(sa, memb) ((sa)->rc_##memb)
|
|
#define _BT_SCO_MEMB(sa, memb) ((sa)->sco_##memb)
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef __VMS
|
|
/* TCP/IP Services for VMS uses a maximum send/recv buffer length */
|
|
#define SEGMENT_SIZE (32 * 1024 -1)
|
|
#endif
|
|
|
|
/*
|
|
* Constants for getnameinfo()
|
|
*/
|
|
#if !defined(NI_MAXHOST)
|
|
#define NI_MAXHOST 1025
|
|
#endif
|
|
#if !defined(NI_MAXSERV)
|
|
#define NI_MAXSERV 32
|
|
#endif
|
|
|
|
/* XXX There's a problem here: *static* functions are not supposed to have
|
|
a Py prefix (or use CapitalizedWords). Later... */
|
|
|
|
/* Global variable holding the exception type for errors detected
|
|
by this module (but not argument type or memory errors, etc.). */
|
|
static PyObject *socket_error;
|
|
static PyObject *socket_herror;
|
|
static PyObject *socket_gaierror;
|
|
static PyObject *socket_timeout;
|
|
|
|
#ifdef RISCOS
|
|
/* Global variable which is !=0 if Python is running in a RISC OS taskwindow */
|
|
static int taskwindow;
|
|
#endif
|
|
|
|
/* A forward reference to the socket type object.
|
|
The sock_type variable contains pointers to various functions,
|
|
some of which call new_sockobject(), which uses sock_type, so
|
|
there has to be a circular reference. */
|
|
static PyTypeObject sock_type;
|
|
|
|
#if defined(HAVE_POLL_H)
|
|
#include <poll.h>
|
|
#elif defined(HAVE_SYS_POLL_H)
|
|
#include <sys/poll.h>
|
|
#endif
|
|
|
|
#ifdef Py_SOCKET_FD_CAN_BE_GE_FD_SETSIZE
|
|
/* Platform can select file descriptors beyond FD_SETSIZE */
|
|
#define IS_SELECTABLE(s) 1
|
|
#elif defined(HAVE_POLL)
|
|
/* Instead of select(), we'll use poll() since poll() works on any fd. */
|
|
#define IS_SELECTABLE(s) 1
|
|
/* Can we call select() with this socket without a buffer overrun? */
|
|
#else
|
|
/* POSIX says selecting file descriptors beyond FD_SETSIZE
|
|
has undefined behaviour. If there's no timeout left, we don't have to
|
|
call select, so it's a safe, little white lie. */
|
|
#define IS_SELECTABLE(s) ((s)->sock_fd < FD_SETSIZE || s->sock_timeout <= 0.0)
|
|
#endif
|
|
|
|
static PyObject*
|
|
select_error(void)
|
|
{
|
|
PyErr_SetString(socket_error, "unable to select on socket");
|
|
return NULL;
|
|
}
|
|
|
|
/* Convenience function to raise an error according to errno
|
|
and return a NULL pointer from a function. */
|
|
|
|
static PyObject *
|
|
set_error(void)
|
|
{
|
|
#ifdef MS_WINDOWS
|
|
int err_no = WSAGetLastError();
|
|
static struct {
|
|
int no;
|
|
const char *msg;
|
|
} *msgp, msgs[] = {
|
|
{WSAEINTR, "Interrupted system call"},
|
|
{WSAEBADF, "Bad file descriptor"},
|
|
{WSAEACCES, "Permission denied"},
|
|
{WSAEFAULT, "Bad address"},
|
|
{WSAEINVAL, "Invalid argument"},
|
|
{WSAEMFILE, "Too many open files"},
|
|
{WSAEWOULDBLOCK,
|
|
"The socket operation could not complete "
|
|
"without blocking"},
|
|
{WSAEINPROGRESS, "Operation now in progress"},
|
|
{WSAEALREADY, "Operation already in progress"},
|
|
{WSAENOTSOCK, "Socket operation on non-socket"},
|
|
{WSAEDESTADDRREQ, "Destination address required"},
|
|
{WSAEMSGSIZE, "Message too long"},
|
|
{WSAEPROTOTYPE, "Protocol wrong type for socket"},
|
|
{WSAENOPROTOOPT, "Protocol not available"},
|
|
{WSAEPROTONOSUPPORT, "Protocol not supported"},
|
|
{WSAESOCKTNOSUPPORT, "Socket type not supported"},
|
|
{WSAEOPNOTSUPP, "Operation not supported"},
|
|
{WSAEPFNOSUPPORT, "Protocol family not supported"},
|
|
{WSAEAFNOSUPPORT, "Address family not supported"},
|
|
{WSAEADDRINUSE, "Address already in use"},
|
|
{WSAEADDRNOTAVAIL, "Can't assign requested address"},
|
|
{WSAENETDOWN, "Network is down"},
|
|
{WSAENETUNREACH, "Network is unreachable"},
|
|
{WSAENETRESET, "Network dropped connection on reset"},
|
|
{WSAECONNABORTED, "Software caused connection abort"},
|
|
{WSAECONNRESET, "Connection reset by peer"},
|
|
{WSAENOBUFS, "No buffer space available"},
|
|
{WSAEISCONN, "Socket is already connected"},
|
|
{WSAENOTCONN, "Socket is not connected"},
|
|
{WSAESHUTDOWN, "Can't send after socket shutdown"},
|
|
{WSAETOOMANYREFS, "Too many references: can't splice"},
|
|
{WSAETIMEDOUT, "Operation timed out"},
|
|
{WSAECONNREFUSED, "Connection refused"},
|
|
{WSAELOOP, "Too many levels of symbolic links"},
|
|
{WSAENAMETOOLONG, "File name too long"},
|
|
{WSAEHOSTDOWN, "Host is down"},
|
|
{WSAEHOSTUNREACH, "No route to host"},
|
|
{WSAENOTEMPTY, "Directory not empty"},
|
|
{WSAEPROCLIM, "Too many processes"},
|
|
{WSAEUSERS, "Too many users"},
|
|
{WSAEDQUOT, "Disc quota exceeded"},
|
|
{WSAESTALE, "Stale NFS file handle"},
|
|
{WSAEREMOTE, "Too many levels of remote in path"},
|
|
{WSASYSNOTREADY, "Network subsystem is unvailable"},
|
|
{WSAVERNOTSUPPORTED, "WinSock version is not supported"},
|
|
{WSANOTINITIALISED,
|
|
"Successful WSAStartup() not yet performed"},
|
|
{WSAEDISCON, "Graceful shutdown in progress"},
|
|
/* Resolver errors */
|
|
{WSAHOST_NOT_FOUND, "No such host is known"},
|
|
{WSATRY_AGAIN, "Host not found, or server failed"},
|
|
{WSANO_RECOVERY, "Unexpected server error encountered"},
|
|
{WSANO_DATA, "Valid name without requested data"},
|
|
{WSANO_ADDRESS, "No address, look for MX record"},
|
|
{0, NULL}
|
|
};
|
|
if (err_no) {
|
|
PyObject *v;
|
|
const char *msg = "winsock error";
|
|
|
|
for (msgp = msgs; msgp->msg; msgp++) {
|
|
if (err_no == msgp->no) {
|
|
msg = msgp->msg;
|
|
break;
|
|
}
|
|
}
|
|
|
|
v = Py_BuildValue("(is)", err_no, msg);
|
|
if (v != NULL) {
|
|
PyErr_SetObject(socket_error, v);
|
|
Py_DECREF(v);
|
|
}
|
|
return NULL;
|
|
}
|
|
else
|
|
#endif
|
|
|
|
#if defined(PYOS_OS2) && !defined(PYCC_GCC)
|
|
if (sock_errno() != NO_ERROR) {
|
|
APIRET rc;
|
|
ULONG msglen;
|
|
char outbuf[100];
|
|
int myerrorcode = sock_errno();
|
|
|
|
/* Retrieve socket-related error message from MPTN.MSG file */
|
|
rc = DosGetMessage(NULL, 0, outbuf, sizeof(outbuf),
|
|
myerrorcode - SOCBASEERR + 26,
|
|
"mptn.msg",
|
|
&msglen);
|
|
if (rc == NO_ERROR) {
|
|
PyObject *v;
|
|
|
|
/* OS/2 doesn't guarantee a terminator */
|
|
outbuf[msglen] = '\0';
|
|
if (strlen(outbuf) > 0) {
|
|
/* If non-empty msg, trim CRLF */
|
|
char *lastc = &outbuf[ strlen(outbuf)-1 ];
|
|
while (lastc > outbuf &&
|
|
isspace(Py_CHARMASK(*lastc))) {
|
|
/* Trim trailing whitespace (CRLF) */
|
|
*lastc-- = '\0';
|
|
}
|
|
}
|
|
v = Py_BuildValue("(is)", myerrorcode, outbuf);
|
|
if (v != NULL) {
|
|
PyErr_SetObject(socket_error, v);
|
|
Py_DECREF(v);
|
|
}
|
|
return NULL;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#if defined(RISCOS)
|
|
if (_inet_error.errnum != NULL) {
|
|
PyObject *v;
|
|
v = Py_BuildValue("(is)", errno, _inet_err());
|
|
if (v != NULL) {
|
|
PyErr_SetObject(socket_error, v);
|
|
Py_DECREF(v);
|
|
}
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
return PyErr_SetFromErrno(socket_error);
|
|
}
|
|
|
|
|
|
static PyObject *
|
|
set_herror(int h_error)
|
|
{
|
|
PyObject *v;
|
|
|
|
#ifdef HAVE_HSTRERROR
|
|
v = Py_BuildValue("(is)", h_error, (char *)hstrerror(h_error));
|
|
#else
|
|
v = Py_BuildValue("(is)", h_error, "host not found");
|
|
#endif
|
|
if (v != NULL) {
|
|
PyErr_SetObject(socket_herror, v);
|
|
Py_DECREF(v);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
|
|
static PyObject *
|
|
set_gaierror(int error)
|
|
{
|
|
PyObject *v;
|
|
|
|
#ifdef EAI_SYSTEM
|
|
/* EAI_SYSTEM is not available on Windows XP. */
|
|
if (error == EAI_SYSTEM)
|
|
return set_error();
|
|
#endif
|
|
|
|
#ifdef HAVE_GAI_STRERROR
|
|
v = Py_BuildValue("(is)", error, gai_strerror(error));
|
|
#else
|
|
v = Py_BuildValue("(is)", error, "getaddrinfo failed");
|
|
#endif
|
|
if (v != NULL) {
|
|
PyErr_SetObject(socket_gaierror, v);
|
|
Py_DECREF(v);
|
|
}
|
|
|
|
return NULL;
|
|
}
|
|
|
|
#ifdef __VMS
|
|
/* Function to send in segments */
|
|
static int
|
|
sendsegmented(int sock_fd, char *buf, int len, int flags)
|
|
{
|
|
int n = 0;
|
|
int remaining = len;
|
|
|
|
while (remaining > 0) {
|
|
unsigned int segment;
|
|
|
|
segment = (remaining >= SEGMENT_SIZE ? SEGMENT_SIZE : remaining);
|
|
n = send(sock_fd, buf, segment, flags);
|
|
if (n < 0) {
|
|
return n;
|
|
}
|
|
remaining -= segment;
|
|
buf += segment;
|
|
} /* end while */
|
|
|
|
return len;
|
|
}
|
|
#endif
|
|
|
|
/* Function to perform the setting of socket blocking mode
|
|
internally. block = (1 | 0). */
|
|
static int
|
|
internal_setblocking(PySocketSockObject *s, int block)
|
|
{
|
|
#ifndef RISCOS
|
|
#ifndef MS_WINDOWS
|
|
int delay_flag;
|
|
#endif
|
|
#endif
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#ifdef __BEOS__
|
|
block = !block;
|
|
setsockopt(s->sock_fd, SOL_SOCKET, SO_NONBLOCK,
|
|
(void *)(&block), sizeof(int));
|
|
#else
|
|
#ifndef RISCOS
|
|
#ifndef MS_WINDOWS
|
|
#if defined(PYOS_OS2) && !defined(PYCC_GCC)
|
|
block = !block;
|
|
ioctl(s->sock_fd, FIONBIO, (caddr_t)&block, sizeof(block));
|
|
#elif defined(__VMS)
|
|
block = !block;
|
|
ioctl(s->sock_fd, FIONBIO, (unsigned int *)&block);
|
|
#else /* !PYOS_OS2 && !__VMS */
|
|
delay_flag = fcntl(s->sock_fd, F_GETFL, 0);
|
|
if (block)
|
|
delay_flag &= (~O_NONBLOCK);
|
|
else
|
|
delay_flag |= O_NONBLOCK;
|
|
fcntl(s->sock_fd, F_SETFL, delay_flag);
|
|
#endif /* !PYOS_OS2 */
|
|
#else /* MS_WINDOWS */
|
|
block = !block;
|
|
ioctlsocket(s->sock_fd, FIONBIO, (u_long*)&block);
|
|
#endif /* MS_WINDOWS */
|
|
#else /* RISCOS */
|
|
block = !block;
|
|
socketioctl(s->sock_fd, FIONBIO, (u_long*)&block);
|
|
#endif /* RISCOS */
|
|
#endif /* __BEOS__ */
|
|
Py_END_ALLOW_THREADS
|
|
|
|
/* Since these don't return anything */
|
|
return 1;
|
|
}
|
|
|
|
/* Do a select()/poll() on the socket, if necessary (sock_timeout > 0).
|
|
The argument writing indicates the direction.
|
|
This does not raise an exception; we'll let our caller do that
|
|
after they've reacquired the interpreter lock.
|
|
Returns 1 on timeout, -1 on error, 0 otherwise. */
|
|
static int
|
|
internal_select(PySocketSockObject *s, int writing)
|
|
{
|
|
int n;
|
|
|
|
/* Nothing to do unless we're in timeout mode (not non-blocking) */
|
|
if (s->sock_timeout <= 0.0)
|
|
return 0;
|
|
|
|
/* Guard against closed socket */
|
|
if (s->sock_fd < 0)
|
|
return 0;
|
|
|
|
/* Prefer poll, if available, since you can poll() any fd
|
|
* which can't be done with select(). */
|
|
#ifdef HAVE_POLL
|
|
{
|
|
struct pollfd pollfd;
|
|
int timeout;
|
|
|
|
pollfd.fd = s->sock_fd;
|
|
pollfd.events = writing ? POLLOUT : POLLIN;
|
|
|
|
/* s->sock_timeout is in seconds, timeout in ms */
|
|
timeout = (int)(s->sock_timeout * 1000 + 0.5);
|
|
n = poll(&pollfd, 1, timeout);
|
|
}
|
|
#else
|
|
{
|
|
/* Construct the arguments to select */
|
|
fd_set fds;
|
|
struct timeval tv;
|
|
tv.tv_sec = (int)s->sock_timeout;
|
|
tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
|
|
FD_ZERO(&fds);
|
|
FD_SET(s->sock_fd, &fds);
|
|
|
|
/* See if the socket is ready */
|
|
if (writing)
|
|
n = select(s->sock_fd+1, NULL, &fds, NULL, &tv);
|
|
else
|
|
n = select(s->sock_fd+1, &fds, NULL, NULL, &tv);
|
|
}
|
|
#endif
|
|
|
|
if (n < 0)
|
|
return -1;
|
|
if (n == 0)
|
|
return 1;
|
|
return 0;
|
|
}
|
|
|
|
/* Initialize a new socket object. */
|
|
|
|
static double defaulttimeout = -1.0; /* Default timeout for new sockets */
|
|
|
|
PyMODINIT_FUNC
|
|
init_sockobject(PySocketSockObject *s,
|
|
SOCKET_T fd, int family, int type, int proto)
|
|
{
|
|
#ifdef RISCOS
|
|
int block = 1;
|
|
#endif
|
|
s->sock_fd = fd;
|
|
s->sock_family = family;
|
|
s->sock_type = type;
|
|
s->sock_proto = proto;
|
|
s->sock_timeout = defaulttimeout;
|
|
|
|
s->errorhandler = &set_error;
|
|
|
|
if (defaulttimeout >= 0.0)
|
|
internal_setblocking(s, 0);
|
|
|
|
#ifdef RISCOS
|
|
if (taskwindow)
|
|
socketioctl(s->sock_fd, 0x80046679, (u_long*)&block);
|
|
#endif
|
|
}
|
|
|
|
|
|
/* Create a new socket object.
|
|
This just creates the object and initializes it.
|
|
If the creation fails, return NULL and set an exception (implicit
|
|
in NEWOBJ()). */
|
|
|
|
static PySocketSockObject *
|
|
new_sockobject(SOCKET_T fd, int family, int type, int proto)
|
|
{
|
|
PySocketSockObject *s;
|
|
s = (PySocketSockObject *)
|
|
PyType_GenericNew(&sock_type, NULL, NULL);
|
|
if (s != NULL)
|
|
init_sockobject(s, fd, family, type, proto);
|
|
return s;
|
|
}
|
|
|
|
|
|
/* Lock to allow python interpreter to continue, but only allow one
|
|
thread to be in gethostbyname or getaddrinfo */
|
|
#if defined(USE_GETHOSTBYNAME_LOCK) || defined(USE_GETADDRINFO_LOCK)
|
|
PyThread_type_lock netdb_lock;
|
|
#endif
|
|
|
|
|
|
/* Convert a string specifying a host name or one of a few symbolic
|
|
names to a numeric IP address. This usually calls gethostbyname()
|
|
to do the work; the names "" and "<broadcast>" are special.
|
|
Return the length (IPv4 should be 4 bytes), or negative if
|
|
an error occurred; then an exception is raised. */
|
|
|
|
static int
|
|
setipaddr(char *name, struct sockaddr *addr_ret, size_t addr_ret_size, int af)
|
|
{
|
|
struct addrinfo hints, *res;
|
|
int error;
|
|
int d1, d2, d3, d4;
|
|
char ch;
|
|
|
|
memset((void *) addr_ret, '\0', sizeof(*addr_ret));
|
|
if (name[0] == '\0') {
|
|
int siz;
|
|
memset(&hints, 0, sizeof(hints));
|
|
hints.ai_family = af;
|
|
hints.ai_socktype = SOCK_DGRAM; /*dummy*/
|
|
hints.ai_flags = AI_PASSIVE;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
ACQUIRE_GETADDRINFO_LOCK
|
|
error = getaddrinfo(NULL, "0", &hints, &res);
|
|
Py_END_ALLOW_THREADS
|
|
/* We assume that those thread-unsafe getaddrinfo() versions
|
|
*are* safe regarding their return value, ie. that a
|
|
subsequent call to getaddrinfo() does not destroy the
|
|
outcome of the first call. */
|
|
RELEASE_GETADDRINFO_LOCK
|
|
if (error) {
|
|
set_gaierror(error);
|
|
return -1;
|
|
}
|
|
switch (res->ai_family) {
|
|
case AF_INET:
|
|
siz = 4;
|
|
break;
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
siz = 16;
|
|
break;
|
|
#endif
|
|
default:
|
|
freeaddrinfo(res);
|
|
PyErr_SetString(socket_error,
|
|
"unsupported address family");
|
|
return -1;
|
|
}
|
|
if (res->ai_next) {
|
|
freeaddrinfo(res);
|
|
PyErr_SetString(socket_error,
|
|
"wildcard resolved to multiple address");
|
|
return -1;
|
|
}
|
|
if (res->ai_addrlen < addr_ret_size)
|
|
addr_ret_size = res->ai_addrlen;
|
|
memcpy(addr_ret, res->ai_addr, addr_ret_size);
|
|
freeaddrinfo(res);
|
|
return siz;
|
|
}
|
|
if (name[0] == '<' && strcmp(name, "<broadcast>") == 0) {
|
|
struct sockaddr_in *sin;
|
|
if (af != AF_INET && af != AF_UNSPEC) {
|
|
PyErr_SetString(socket_error,
|
|
"address family mismatched");
|
|
return -1;
|
|
}
|
|
sin = (struct sockaddr_in *)addr_ret;
|
|
memset((void *) sin, '\0', sizeof(*sin));
|
|
sin->sin_family = AF_INET;
|
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
|
sin->sin_len = sizeof(*sin);
|
|
#endif
|
|
sin->sin_addr.s_addr = INADDR_BROADCAST;
|
|
return sizeof(sin->sin_addr);
|
|
}
|
|
if (sscanf(name, "%d.%d.%d.%d%c", &d1, &d2, &d3, &d4, &ch) == 4 &&
|
|
0 <= d1 && d1 <= 255 && 0 <= d2 && d2 <= 255 &&
|
|
0 <= d3 && d3 <= 255 && 0 <= d4 && d4 <= 255) {
|
|
struct sockaddr_in *sin;
|
|
sin = (struct sockaddr_in *)addr_ret;
|
|
sin->sin_addr.s_addr = htonl(
|
|
((long) d1 << 24) | ((long) d2 << 16) |
|
|
((long) d3 << 8) | ((long) d4 << 0));
|
|
sin->sin_family = AF_INET;
|
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
|
sin->sin_len = sizeof(*sin);
|
|
#endif
|
|
return 4;
|
|
}
|
|
memset(&hints, 0, sizeof(hints));
|
|
hints.ai_family = af;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
ACQUIRE_GETADDRINFO_LOCK
|
|
error = getaddrinfo(name, NULL, &hints, &res);
|
|
#if defined(__digital__) && defined(__unix__)
|
|
if (error == EAI_NONAME && af == AF_UNSPEC) {
|
|
/* On Tru64 V5.1, numeric-to-addr conversion fails
|
|
if no address family is given. Assume IPv4 for now.*/
|
|
hints.ai_family = AF_INET;
|
|
error = getaddrinfo(name, NULL, &hints, &res);
|
|
}
|
|
#endif
|
|
Py_END_ALLOW_THREADS
|
|
RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
|
|
if (error) {
|
|
set_gaierror(error);
|
|
return -1;
|
|
}
|
|
if (res->ai_addrlen < addr_ret_size)
|
|
addr_ret_size = res->ai_addrlen;
|
|
memcpy((char *) addr_ret, res->ai_addr, addr_ret_size);
|
|
freeaddrinfo(res);
|
|
switch (addr_ret->sa_family) {
|
|
case AF_INET:
|
|
return 4;
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
return 16;
|
|
#endif
|
|
default:
|
|
PyErr_SetString(socket_error, "unknown address family");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
|
|
/* Create a string object representing an IP address.
|
|
This is always a string of the form 'dd.dd.dd.dd' (with variable
|
|
size numbers). */
|
|
|
|
static PyObject *
|
|
makeipaddr(struct sockaddr *addr, int addrlen)
|
|
{
|
|
char buf[NI_MAXHOST];
|
|
int error;
|
|
|
|
error = getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0,
|
|
NI_NUMERICHOST);
|
|
if (error) {
|
|
set_gaierror(error);
|
|
return NULL;
|
|
}
|
|
return PyString_FromString(buf);
|
|
}
|
|
|
|
|
|
#ifdef USE_BLUETOOTH
|
|
/* Convert a string representation of a Bluetooth address into a numeric
|
|
address. Returns the length (6), or raises an exception and returns -1 if
|
|
an error occurred. */
|
|
|
|
static int
|
|
setbdaddr(char *name, bdaddr_t *bdaddr)
|
|
{
|
|
unsigned int b0, b1, b2, b3, b4, b5;
|
|
char ch;
|
|
int n;
|
|
|
|
n = sscanf(name, "%X:%X:%X:%X:%X:%X%c",
|
|
&b5, &b4, &b3, &b2, &b1, &b0, &ch);
|
|
if (n == 6 && (b0 | b1 | b2 | b3 | b4 | b5) < 256) {
|
|
bdaddr->b[0] = b0;
|
|
bdaddr->b[1] = b1;
|
|
bdaddr->b[2] = b2;
|
|
bdaddr->b[3] = b3;
|
|
bdaddr->b[4] = b4;
|
|
bdaddr->b[5] = b5;
|
|
return 6;
|
|
} else {
|
|
PyErr_SetString(socket_error, "bad bluetooth address");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
/* Create a string representation of the Bluetooth address. This is always a
|
|
string of the form 'XX:XX:XX:XX:XX:XX' where XX is a two digit hexadecimal
|
|
value (zero padded if necessary). */
|
|
|
|
static PyObject *
|
|
makebdaddr(bdaddr_t *bdaddr)
|
|
{
|
|
char buf[(6 * 2) + 5 + 1];
|
|
|
|
sprintf(buf, "%02X:%02X:%02X:%02X:%02X:%02X",
|
|
bdaddr->b[5], bdaddr->b[4], bdaddr->b[3],
|
|
bdaddr->b[2], bdaddr->b[1], bdaddr->b[0]);
|
|
return PyString_FromString(buf);
|
|
}
|
|
#endif
|
|
|
|
|
|
/* Create an object representing the given socket address,
|
|
suitable for passing it back to bind(), connect() etc.
|
|
The family field of the sockaddr structure is inspected
|
|
to determine what kind of address it really is. */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
makesockaddr(int sockfd, struct sockaddr *addr, int addrlen, int proto)
|
|
{
|
|
if (addrlen == 0) {
|
|
/* No address -- may be recvfrom() from known socket */
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
#ifdef __BEOS__
|
|
/* XXX: BeOS version of accept() doesn't set family correctly */
|
|
addr->sa_family = AF_INET;
|
|
#endif
|
|
|
|
switch (addr->sa_family) {
|
|
|
|
case AF_INET:
|
|
{
|
|
struct sockaddr_in *a;
|
|
PyObject *addrobj = makeipaddr(addr, sizeof(*a));
|
|
PyObject *ret = NULL;
|
|
if (addrobj) {
|
|
a = (struct sockaddr_in *)addr;
|
|
ret = Py_BuildValue("Oi", addrobj, ntohs(a->sin_port));
|
|
Py_DECREF(addrobj);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
#if defined(AF_UNIX)
|
|
case AF_UNIX:
|
|
{
|
|
struct sockaddr_un *a = (struct sockaddr_un *) addr;
|
|
#ifdef linux
|
|
if (a->sun_path[0] == 0) { /* Linux abstract namespace */
|
|
addrlen -= (sizeof(*a) - sizeof(a->sun_path));
|
|
return PyString_FromStringAndSize(a->sun_path,
|
|
addrlen);
|
|
}
|
|
else
|
|
#endif /* linux */
|
|
{
|
|
/* regular NULL-terminated string */
|
|
return PyString_FromString(a->sun_path);
|
|
}
|
|
}
|
|
#endif /* AF_UNIX */
|
|
|
|
#if defined(AF_NETLINK)
|
|
case AF_NETLINK:
|
|
{
|
|
struct sockaddr_nl *a = (struct sockaddr_nl *) addr;
|
|
return Py_BuildValue("II", a->nl_pid, a->nl_groups);
|
|
}
|
|
#endif /* AF_NETLINK */
|
|
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
{
|
|
struct sockaddr_in6 *a;
|
|
PyObject *addrobj = makeipaddr(addr, sizeof(*a));
|
|
PyObject *ret = NULL;
|
|
if (addrobj) {
|
|
a = (struct sockaddr_in6 *)addr;
|
|
ret = Py_BuildValue("Oiii",
|
|
addrobj,
|
|
ntohs(a->sin6_port),
|
|
a->sin6_flowinfo,
|
|
a->sin6_scope_id);
|
|
Py_DECREF(addrobj);
|
|
}
|
|
return ret;
|
|
}
|
|
#endif
|
|
|
|
#ifdef USE_BLUETOOTH
|
|
case AF_BLUETOOTH:
|
|
switch (proto) {
|
|
|
|
case BTPROTO_L2CAP:
|
|
{
|
|
struct sockaddr_l2 *a = (struct sockaddr_l2 *) addr;
|
|
PyObject *addrobj = makebdaddr(&_BT_L2_MEMB(a, bdaddr));
|
|
PyObject *ret = NULL;
|
|
if (addrobj) {
|
|
ret = Py_BuildValue("Oi",
|
|
addrobj,
|
|
_BT_L2_MEMB(a, psm));
|
|
Py_DECREF(addrobj);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
case BTPROTO_RFCOMM:
|
|
{
|
|
struct sockaddr_rc *a = (struct sockaddr_rc *) addr;
|
|
PyObject *addrobj = makebdaddr(&_BT_RC_MEMB(a, bdaddr));
|
|
PyObject *ret = NULL;
|
|
if (addrobj) {
|
|
ret = Py_BuildValue("Oi",
|
|
addrobj,
|
|
_BT_RC_MEMB(a, channel));
|
|
Py_DECREF(addrobj);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
#if !defined(__FreeBSD__)
|
|
case BTPROTO_SCO:
|
|
{
|
|
struct sockaddr_sco *a = (struct sockaddr_sco *) addr;
|
|
return makebdaddr(&_BT_SCO_MEMB(a, bdaddr));
|
|
}
|
|
#endif
|
|
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_NETPACKET_PACKET_H
|
|
case AF_PACKET:
|
|
{
|
|
struct sockaddr_ll *a = (struct sockaddr_ll *)addr;
|
|
char *ifname = "";
|
|
struct ifreq ifr;
|
|
/* need to look up interface name give index */
|
|
if (a->sll_ifindex) {
|
|
ifr.ifr_ifindex = a->sll_ifindex;
|
|
if (ioctl(sockfd, SIOCGIFNAME, &ifr) == 0)
|
|
ifname = ifr.ifr_name;
|
|
}
|
|
return Py_BuildValue("shbhs#",
|
|
ifname,
|
|
ntohs(a->sll_protocol),
|
|
a->sll_pkttype,
|
|
a->sll_hatype,
|
|
a->sll_addr,
|
|
a->sll_halen);
|
|
}
|
|
#endif
|
|
|
|
/* More cases here... */
|
|
|
|
default:
|
|
/* If we don't know the address family, don't raise an
|
|
exception -- return it as a tuple. */
|
|
return Py_BuildValue("is#",
|
|
addr->sa_family,
|
|
addr->sa_data,
|
|
sizeof(addr->sa_data));
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/* Parse a socket address argument according to the socket object's
|
|
address family. Return 1 if the address was in the proper format,
|
|
0 of not. The address is returned through addr_ret, its length
|
|
through len_ret. */
|
|
|
|
static int
|
|
getsockaddrarg(PySocketSockObject *s, PyObject *args,
|
|
struct sockaddr **addr_ret, int *len_ret)
|
|
{
|
|
switch (s->sock_family) {
|
|
|
|
#if defined(AF_UNIX)
|
|
case AF_UNIX:
|
|
{
|
|
struct sockaddr_un* addr;
|
|
char *path;
|
|
int len;
|
|
addr = (struct sockaddr_un*)&(s->sock_addr).un;
|
|
if (!PyArg_Parse(args, "t#", &path, &len))
|
|
return 0;
|
|
#ifdef linux
|
|
if (len > 0 && path[0] == 0) {
|
|
/* Linux abstract namespace extension */
|
|
if (len > sizeof addr->sun_path) {
|
|
PyErr_SetString(socket_error,
|
|
"AF_UNIX path too long");
|
|
return 0;
|
|
}
|
|
}
|
|
else
|
|
#endif /* linux */
|
|
{
|
|
/* regular NULL-terminated string */
|
|
if (len >= sizeof addr->sun_path) {
|
|
PyErr_SetString(socket_error,
|
|
"AF_UNIX path too long");
|
|
return 0;
|
|
}
|
|
addr->sun_path[len] = 0;
|
|
}
|
|
addr->sun_family = s->sock_family;
|
|
memcpy(addr->sun_path, path, len);
|
|
*addr_ret = (struct sockaddr *) addr;
|
|
#if defined(PYOS_OS2)
|
|
*len_ret = sizeof(*addr);
|
|
#else
|
|
*len_ret = len + sizeof(*addr) - sizeof(addr->sun_path);
|
|
#endif
|
|
return 1;
|
|
}
|
|
#endif /* AF_UNIX */
|
|
|
|
#if defined(AF_NETLINK)
|
|
case AF_NETLINK:
|
|
{
|
|
struct sockaddr_nl* addr;
|
|
int pid, groups;
|
|
addr = (struct sockaddr_nl *)&(s->sock_addr).nl;
|
|
if (!PyTuple_Check(args)) {
|
|
PyErr_Format(
|
|
PyExc_TypeError,
|
|
"getsockaddrarg: "
|
|
"AF_NETLINK address must be tuple, not %.500s",
|
|
args->ob_type->tp_name);
|
|
return 0;
|
|
}
|
|
if (!PyArg_ParseTuple(args, "II:getsockaddrarg", &pid, &groups))
|
|
return 0;
|
|
addr->nl_family = AF_NETLINK;
|
|
addr->nl_pid = pid;
|
|
addr->nl_groups = groups;
|
|
*addr_ret = (struct sockaddr *) addr;
|
|
*len_ret = sizeof(*addr);
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
case AF_INET:
|
|
{
|
|
struct sockaddr_in* addr;
|
|
char *host;
|
|
int port, result;
|
|
addr=(struct sockaddr_in*)&(s->sock_addr).in;
|
|
if (!PyTuple_Check(args)) {
|
|
PyErr_Format(
|
|
PyExc_TypeError,
|
|
"getsockaddrarg: "
|
|
"AF_INET address must be tuple, not %.500s",
|
|
args->ob_type->tp_name);
|
|
return 0;
|
|
}
|
|
if (!PyArg_ParseTuple(args, "eti:getsockaddrarg",
|
|
"idna", &host, &port))
|
|
return 0;
|
|
result = setipaddr(host, (struct sockaddr *)addr,
|
|
sizeof(*addr), AF_INET);
|
|
PyMem_Free(host);
|
|
if (result < 0)
|
|
return 0;
|
|
addr->sin_family = AF_INET;
|
|
addr->sin_port = htons((short)port);
|
|
*addr_ret = (struct sockaddr *) addr;
|
|
*len_ret = sizeof *addr;
|
|
return 1;
|
|
}
|
|
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
{
|
|
struct sockaddr_in6* addr;
|
|
char *host;
|
|
int port, flowinfo, scope_id, result;
|
|
addr = (struct sockaddr_in6*)&(s->sock_addr).in6;
|
|
flowinfo = scope_id = 0;
|
|
if (!PyTuple_Check(args)) {
|
|
PyErr_Format(
|
|
PyExc_TypeError,
|
|
"getsockaddrarg: "
|
|
"AF_INET6 address must be tuple, not %.500s",
|
|
args->ob_type->tp_name);
|
|
return 0;
|
|
}
|
|
if (!PyArg_ParseTuple(args, "eti|ii",
|
|
"idna", &host, &port, &flowinfo,
|
|
&scope_id)) {
|
|
return 0;
|
|
}
|
|
result = setipaddr(host, (struct sockaddr *)addr,
|
|
sizeof(*addr), AF_INET6);
|
|
PyMem_Free(host);
|
|
if (result < 0)
|
|
return 0;
|
|
addr->sin6_family = s->sock_family;
|
|
addr->sin6_port = htons((short)port);
|
|
addr->sin6_flowinfo = flowinfo;
|
|
addr->sin6_scope_id = scope_id;
|
|
*addr_ret = (struct sockaddr *) addr;
|
|
*len_ret = sizeof *addr;
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
#ifdef USE_BLUETOOTH
|
|
case AF_BLUETOOTH:
|
|
{
|
|
switch (s->sock_proto) {
|
|
case BTPROTO_L2CAP:
|
|
{
|
|
struct sockaddr_l2 *addr = (struct sockaddr_l2 *) _BT_SOCKADDR_MEMB(s, l2);
|
|
char *straddr;
|
|
|
|
_BT_L2_MEMB(addr, family) = AF_BLUETOOTH;
|
|
if (!PyArg_ParseTuple(args, "si", &straddr,
|
|
&_BT_L2_MEMB(addr, psm))) {
|
|
PyErr_SetString(socket_error, "getsockaddrarg: "
|
|
"wrong format");
|
|
return 0;
|
|
}
|
|
if (setbdaddr(straddr, &_BT_L2_MEMB(addr, bdaddr)) < 0)
|
|
return 0;
|
|
|
|
*addr_ret = (struct sockaddr *) addr;
|
|
*len_ret = sizeof *addr;
|
|
return 1;
|
|
}
|
|
case BTPROTO_RFCOMM:
|
|
{
|
|
struct sockaddr_rc *addr = (struct sockaddr_rc *) _BT_SOCKADDR_MEMB(s, rc);
|
|
char *straddr;
|
|
|
|
_BT_RC_MEMB(addr, family) = AF_BLUETOOTH;
|
|
if (!PyArg_ParseTuple(args, "si", &straddr,
|
|
&_BT_RC_MEMB(addr, channel))) {
|
|
PyErr_SetString(socket_error, "getsockaddrarg: "
|
|
"wrong format");
|
|
return 0;
|
|
}
|
|
if (setbdaddr(straddr, &_BT_RC_MEMB(addr, bdaddr)) < 0)
|
|
return 0;
|
|
|
|
*addr_ret = (struct sockaddr *) addr;
|
|
*len_ret = sizeof *addr;
|
|
return 1;
|
|
}
|
|
#if !defined(__FreeBSD__)
|
|
case BTPROTO_SCO:
|
|
{
|
|
struct sockaddr_sco *addr = (struct sockaddr_sco *) _BT_SOCKADDR_MEMB(s, sco);
|
|
char *straddr;
|
|
|
|
_BT_SCO_MEMB(addr, family) = AF_BLUETOOTH;
|
|
straddr = PyString_AsString(args);
|
|
if (straddr == NULL) {
|
|
PyErr_SetString(socket_error, "getsockaddrarg: "
|
|
"wrong format");
|
|
return 0;
|
|
}
|
|
if (setbdaddr(straddr, &_BT_SCO_MEMB(addr, bdaddr)) < 0)
|
|
return 0;
|
|
|
|
*addr_ret = (struct sockaddr *) addr;
|
|
*len_ret = sizeof *addr;
|
|
return 1;
|
|
}
|
|
#endif
|
|
default:
|
|
PyErr_SetString(socket_error, "getsockaddrarg: unknown Bluetooth protocol");
|
|
return 0;
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_NETPACKET_PACKET_H
|
|
case AF_PACKET:
|
|
{
|
|
struct sockaddr_ll* addr;
|
|
struct ifreq ifr;
|
|
char *interfaceName;
|
|
int protoNumber;
|
|
int hatype = 0;
|
|
int pkttype = 0;
|
|
char *haddr = NULL;
|
|
unsigned int halen = 0;
|
|
|
|
if (!PyTuple_Check(args)) {
|
|
PyErr_Format(
|
|
PyExc_TypeError,
|
|
"getsockaddrarg: "
|
|
"AF_PACKET address must be tuple, not %.500s",
|
|
args->ob_type->tp_name);
|
|
return 0;
|
|
}
|
|
if (!PyArg_ParseTuple(args, "si|iis#", &interfaceName,
|
|
&protoNumber, &pkttype, &hatype,
|
|
&haddr, &halen))
|
|
return 0;
|
|
strncpy(ifr.ifr_name, interfaceName, sizeof(ifr.ifr_name));
|
|
ifr.ifr_name[(sizeof(ifr.ifr_name))-1] = '\0';
|
|
if (ioctl(s->sock_fd, SIOCGIFINDEX, &ifr) < 0) {
|
|
s->errorhandler();
|
|
return 0;
|
|
}
|
|
addr = &(s->sock_addr.ll);
|
|
addr->sll_family = AF_PACKET;
|
|
addr->sll_protocol = htons((short)protoNumber);
|
|
addr->sll_ifindex = ifr.ifr_ifindex;
|
|
addr->sll_pkttype = pkttype;
|
|
addr->sll_hatype = hatype;
|
|
if (halen > 8) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Hardware address must be 8 bytes or less");
|
|
return 0;
|
|
}
|
|
if (halen != 0) {
|
|
memcpy(&addr->sll_addr, haddr, halen);
|
|
}
|
|
addr->sll_halen = halen;
|
|
*addr_ret = (struct sockaddr *) addr;
|
|
*len_ret = sizeof *addr;
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
/* More cases here... */
|
|
|
|
default:
|
|
PyErr_SetString(socket_error, "getsockaddrarg: bad family");
|
|
return 0;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/* Get the address length according to the socket object's address family.
|
|
Return 1 if the family is known, 0 otherwise. The length is returned
|
|
through len_ret. */
|
|
|
|
static int
|
|
getsockaddrlen(PySocketSockObject *s, socklen_t *len_ret)
|
|
{
|
|
switch (s->sock_family) {
|
|
|
|
#if defined(AF_UNIX)
|
|
case AF_UNIX:
|
|
{
|
|
*len_ret = sizeof (struct sockaddr_un);
|
|
return 1;
|
|
}
|
|
#endif /* AF_UNIX */
|
|
#if defined(AF_NETLINK)
|
|
case AF_NETLINK:
|
|
{
|
|
*len_ret = sizeof (struct sockaddr_nl);
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
case AF_INET:
|
|
{
|
|
*len_ret = sizeof (struct sockaddr_in);
|
|
return 1;
|
|
}
|
|
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
{
|
|
*len_ret = sizeof (struct sockaddr_in6);
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
#ifdef USE_BLUETOOTH
|
|
case AF_BLUETOOTH:
|
|
{
|
|
switch(s->sock_proto)
|
|
{
|
|
|
|
case BTPROTO_L2CAP:
|
|
*len_ret = sizeof (struct sockaddr_l2);
|
|
return 1;
|
|
case BTPROTO_RFCOMM:
|
|
*len_ret = sizeof (struct sockaddr_rc);
|
|
return 1;
|
|
#if !defined(__FreeBSD__)
|
|
case BTPROTO_SCO:
|
|
*len_ret = sizeof (struct sockaddr_sco);
|
|
return 1;
|
|
#endif
|
|
default:
|
|
PyErr_SetString(socket_error, "getsockaddrlen: "
|
|
"unknown BT protocol");
|
|
return 0;
|
|
|
|
}
|
|
}
|
|
#endif
|
|
|
|
#ifdef HAVE_NETPACKET_PACKET_H
|
|
case AF_PACKET:
|
|
{
|
|
*len_ret = sizeof (struct sockaddr_ll);
|
|
return 1;
|
|
}
|
|
#endif
|
|
|
|
/* More cases here... */
|
|
|
|
default:
|
|
PyErr_SetString(socket_error, "getsockaddrlen: bad family");
|
|
return 0;
|
|
|
|
}
|
|
}
|
|
|
|
|
|
/* s.accept() method */
|
|
|
|
static PyObject *
|
|
sock_accept(PySocketSockObject *s)
|
|
{
|
|
sock_addr_t addrbuf;
|
|
SOCKET_T newfd;
|
|
socklen_t addrlen;
|
|
PyObject *sock = NULL;
|
|
PyObject *addr = NULL;
|
|
PyObject *res = NULL;
|
|
int timeout;
|
|
|
|
if (!getsockaddrlen(s, &addrlen))
|
|
return NULL;
|
|
memset(&addrbuf, 0, addrlen);
|
|
|
|
#ifdef MS_WINDOWS
|
|
newfd = INVALID_SOCKET;
|
|
#else
|
|
newfd = -1;
|
|
#endif
|
|
|
|
if (!IS_SELECTABLE(s))
|
|
return select_error();
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
timeout = internal_select(s, 0);
|
|
if (!timeout)
|
|
newfd = accept(s->sock_fd, (struct sockaddr *) &addrbuf,
|
|
&addrlen);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return NULL;
|
|
}
|
|
|
|
#ifdef MS_WINDOWS
|
|
if (newfd == INVALID_SOCKET)
|
|
#else
|
|
if (newfd < 0)
|
|
#endif
|
|
return s->errorhandler();
|
|
|
|
/* Create the new object with unspecified family,
|
|
to avoid calls to bind() etc. on it. */
|
|
sock = (PyObject *) new_sockobject(newfd,
|
|
s->sock_family,
|
|
s->sock_type,
|
|
s->sock_proto);
|
|
|
|
if (sock == NULL) {
|
|
SOCKETCLOSE(newfd);
|
|
goto finally;
|
|
}
|
|
addr = makesockaddr(s->sock_fd, (struct sockaddr *) &addrbuf,
|
|
addrlen, s->sock_proto);
|
|
if (addr == NULL)
|
|
goto finally;
|
|
|
|
res = PyTuple_Pack(2, sock, addr);
|
|
|
|
finally:
|
|
Py_XDECREF(sock);
|
|
Py_XDECREF(addr);
|
|
return res;
|
|
}
|
|
|
|
PyDoc_STRVAR(accept_doc,
|
|
"accept() -> (socket object, address info)\n\
|
|
\n\
|
|
Wait for an incoming connection. Return a new socket representing the\n\
|
|
connection, and the address of the client. For IP sockets, the address\n\
|
|
info is a pair (hostaddr, port).");
|
|
|
|
/* s.setblocking(flag) method. Argument:
|
|
False -- non-blocking mode; same as settimeout(0)
|
|
True -- blocking mode; same as settimeout(None)
|
|
*/
|
|
|
|
static PyObject *
|
|
sock_setblocking(PySocketSockObject *s, PyObject *arg)
|
|
{
|
|
int block;
|
|
|
|
block = PyInt_AsLong(arg);
|
|
if (block == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
|
|
s->sock_timeout = block ? -1.0 : 0.0;
|
|
internal_setblocking(s, block);
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(setblocking_doc,
|
|
"setblocking(flag)\n\
|
|
\n\
|
|
Set the socket to blocking (flag is true) or non-blocking (false).\n\
|
|
setblocking(True) is equivalent to settimeout(None);\n\
|
|
setblocking(False) is equivalent to settimeout(0.0).");
|
|
|
|
/* s.settimeout(timeout) method. Argument:
|
|
None -- no timeout, blocking mode; same as setblocking(True)
|
|
0.0 -- non-blocking mode; same as setblocking(False)
|
|
> 0 -- timeout mode; operations time out after timeout seconds
|
|
< 0 -- illegal; raises an exception
|
|
*/
|
|
static PyObject *
|
|
sock_settimeout(PySocketSockObject *s, PyObject *arg)
|
|
{
|
|
double timeout;
|
|
|
|
if (arg == Py_None)
|
|
timeout = -1.0;
|
|
else {
|
|
timeout = PyFloat_AsDouble(arg);
|
|
if (timeout < 0.0) {
|
|
if (!PyErr_Occurred())
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Timeout value out of range");
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
s->sock_timeout = timeout;
|
|
internal_setblocking(s, timeout < 0.0);
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(settimeout_doc,
|
|
"settimeout(timeout)\n\
|
|
\n\
|
|
Set a timeout on socket operations. 'timeout' can be a float,\n\
|
|
giving in seconds, or None. Setting a timeout of None disables\n\
|
|
the timeout feature and is equivalent to setblocking(1).\n\
|
|
Setting a timeout of zero is the same as setblocking(0).");
|
|
|
|
/* s.gettimeout() method.
|
|
Returns the timeout associated with a socket. */
|
|
static PyObject *
|
|
sock_gettimeout(PySocketSockObject *s)
|
|
{
|
|
if (s->sock_timeout < 0.0) {
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
else
|
|
return PyFloat_FromDouble(s->sock_timeout);
|
|
}
|
|
|
|
PyDoc_STRVAR(gettimeout_doc,
|
|
"gettimeout() -> timeout\n\
|
|
\n\
|
|
Returns the timeout in floating seconds associated with socket \n\
|
|
operations. A timeout of None indicates that timeouts on socket \n\
|
|
operations are disabled.");
|
|
|
|
#ifdef RISCOS
|
|
/* s.sleeptaskw(1 | 0) method */
|
|
|
|
static PyObject *
|
|
sock_sleeptaskw(PySocketSockObject *s,PyObject *arg)
|
|
{
|
|
int block;
|
|
block = PyInt_AsLong(arg);
|
|
if (block == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
socketioctl(s->sock_fd, 0x80046679, (u_long*)&block);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
PyDoc_STRVAR(sleeptaskw_doc,
|
|
"sleeptaskw(flag)\n\
|
|
\n\
|
|
Allow sleeps in taskwindows.");
|
|
#endif
|
|
|
|
|
|
/* s.setsockopt() method.
|
|
With an integer third argument, sets an integer option.
|
|
With a string third argument, sets an option from a buffer;
|
|
use optional built-in module 'struct' to encode the string. */
|
|
|
|
static PyObject *
|
|
sock_setsockopt(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
int level;
|
|
int optname;
|
|
int res;
|
|
char *buf;
|
|
int buflen;
|
|
int flag;
|
|
|
|
if (PyArg_ParseTuple(args, "iii:setsockopt",
|
|
&level, &optname, &flag)) {
|
|
buf = (char *) &flag;
|
|
buflen = sizeof flag;
|
|
}
|
|
else {
|
|
PyErr_Clear();
|
|
if (!PyArg_ParseTuple(args, "iis#:setsockopt",
|
|
&level, &optname, &buf, &buflen))
|
|
return NULL;
|
|
}
|
|
res = setsockopt(s->sock_fd, level, optname, (void *)buf, buflen);
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(setsockopt_doc,
|
|
"setsockopt(level, option, value)\n\
|
|
\n\
|
|
Set a socket option. See the Unix manual for level and option.\n\
|
|
The value argument can either be an integer or a string.");
|
|
|
|
|
|
/* s.getsockopt() method.
|
|
With two arguments, retrieves an integer option.
|
|
With a third integer argument, retrieves a string buffer of that size;
|
|
use optional built-in module 'struct' to decode the string. */
|
|
|
|
static PyObject *
|
|
sock_getsockopt(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
int level;
|
|
int optname;
|
|
int res;
|
|
PyObject *buf;
|
|
socklen_t buflen = 0;
|
|
|
|
#ifdef __BEOS__
|
|
/* We have incomplete socket support. */
|
|
PyErr_SetString(socket_error, "getsockopt not supported");
|
|
return NULL;
|
|
#else
|
|
|
|
if (!PyArg_ParseTuple(args, "ii|i:getsockopt",
|
|
&level, &optname, &buflen))
|
|
return NULL;
|
|
|
|
if (buflen == 0) {
|
|
int flag = 0;
|
|
socklen_t flagsize = sizeof flag;
|
|
res = getsockopt(s->sock_fd, level, optname,
|
|
(void *)&flag, &flagsize);
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
return PyInt_FromLong(flag);
|
|
}
|
|
#ifdef __VMS
|
|
/* socklen_t is unsigned so no negative test is needed,
|
|
test buflen == 0 is previously done */
|
|
if (buflen > 1024) {
|
|
#else
|
|
if (buflen <= 0 || buflen > 1024) {
|
|
#endif
|
|
PyErr_SetString(socket_error,
|
|
"getsockopt buflen out of range");
|
|
return NULL;
|
|
}
|
|
buf = PyString_FromStringAndSize((char *)NULL, buflen);
|
|
if (buf == NULL)
|
|
return NULL;
|
|
res = getsockopt(s->sock_fd, level, optname,
|
|
(void *)PyString_AS_STRING(buf), &buflen);
|
|
if (res < 0) {
|
|
Py_DECREF(buf);
|
|
return s->errorhandler();
|
|
}
|
|
_PyString_Resize(&buf, buflen);
|
|
return buf;
|
|
#endif /* __BEOS__ */
|
|
}
|
|
|
|
PyDoc_STRVAR(getsockopt_doc,
|
|
"getsockopt(level, option[, buffersize]) -> value\n\
|
|
\n\
|
|
Get a socket option. See the Unix manual for level and option.\n\
|
|
If a nonzero buffersize argument is given, the return value is a\n\
|
|
string of that length; otherwise it is an integer.");
|
|
|
|
|
|
/* s.bind(sockaddr) method */
|
|
|
|
static PyObject *
|
|
sock_bind(PySocketSockObject *s, PyObject *addro)
|
|
{
|
|
struct sockaddr *addr;
|
|
int addrlen;
|
|
int res;
|
|
|
|
if (!getsockaddrarg(s, addro, &addr, &addrlen))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = bind(s->sock_fd, addr, addrlen);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(bind_doc,
|
|
"bind(address)\n\
|
|
\n\
|
|
Bind the socket to a local address. For IP sockets, the address is a\n\
|
|
pair (host, port); the host must refer to the local host. For raw packet\n\
|
|
sockets the address is a tuple (ifname, proto [,pkttype [,hatype]])");
|
|
|
|
|
|
/* s.close() method.
|
|
Set the file descriptor to -1 so operations tried subsequently
|
|
will surely fail. */
|
|
|
|
static PyObject *
|
|
sock_close(PySocketSockObject *s)
|
|
{
|
|
SOCKET_T fd;
|
|
|
|
if ((fd = s->sock_fd) != -1) {
|
|
s->sock_fd = -1;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
(void) SOCKETCLOSE(fd);
|
|
Py_END_ALLOW_THREADS
|
|
}
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(close_doc,
|
|
"close()\n\
|
|
\n\
|
|
Close the socket. It cannot be used after this call.");
|
|
|
|
static int
|
|
internal_connect(PySocketSockObject *s, struct sockaddr *addr, int addrlen,
|
|
int *timeoutp)
|
|
{
|
|
int res, timeout;
|
|
|
|
timeout = 0;
|
|
res = connect(s->sock_fd, addr, addrlen);
|
|
|
|
#ifdef MS_WINDOWS
|
|
|
|
if (s->sock_timeout > 0.0) {
|
|
if (res < 0 && WSAGetLastError() == WSAEWOULDBLOCK &&
|
|
IS_SELECTABLE(s)) {
|
|
/* This is a mess. Best solution: trust select */
|
|
fd_set fds;
|
|
fd_set fds_exc;
|
|
struct timeval tv;
|
|
tv.tv_sec = (int)s->sock_timeout;
|
|
tv.tv_usec = (int)((s->sock_timeout - tv.tv_sec) * 1e6);
|
|
FD_ZERO(&fds);
|
|
FD_SET(s->sock_fd, &fds);
|
|
FD_ZERO(&fds_exc);
|
|
FD_SET(s->sock_fd, &fds_exc);
|
|
res = select(s->sock_fd+1, NULL, &fds, &fds_exc, &tv);
|
|
if (res == 0) {
|
|
res = WSAEWOULDBLOCK;
|
|
timeout = 1;
|
|
} else if (res > 0) {
|
|
if (FD_ISSET(s->sock_fd, &fds))
|
|
/* The socket is in the writeable set - this
|
|
means connected */
|
|
res = 0;
|
|
else {
|
|
/* As per MS docs, we need to call getsockopt()
|
|
to get the underlying error */
|
|
int res_size = sizeof res;
|
|
/* It must be in the exception set */
|
|
assert(FD_ISSET(s->sock_fd, &fds_exc));
|
|
if (0 == getsockopt(s->sock_fd, SOL_SOCKET, SO_ERROR,
|
|
(char *)&res, &res_size))
|
|
/* getsockopt also clears WSAGetLastError,
|
|
so reset it back. */
|
|
WSASetLastError(res);
|
|
else
|
|
res = WSAGetLastError();
|
|
}
|
|
}
|
|
/* else if (res < 0) an error occurred */
|
|
}
|
|
}
|
|
|
|
if (res < 0)
|
|
res = WSAGetLastError();
|
|
|
|
#else
|
|
|
|
if (s->sock_timeout > 0.0) {
|
|
if (res < 0 && errno == EINPROGRESS && IS_SELECTABLE(s)) {
|
|
timeout = internal_select(s, 1);
|
|
if (timeout == 0) {
|
|
res = connect(s->sock_fd, addr, addrlen);
|
|
if (res < 0 && errno == EISCONN)
|
|
res = 0;
|
|
}
|
|
else if (timeout == -1)
|
|
res = errno; /* had error */
|
|
else
|
|
res = EWOULDBLOCK; /* timed out */
|
|
}
|
|
}
|
|
|
|
if (res < 0)
|
|
res = errno;
|
|
|
|
#endif
|
|
*timeoutp = timeout;
|
|
|
|
return res;
|
|
}
|
|
|
|
/* s.connect(sockaddr) method */
|
|
|
|
static PyObject *
|
|
sock_connect(PySocketSockObject *s, PyObject *addro)
|
|
{
|
|
struct sockaddr *addr;
|
|
int addrlen;
|
|
int res;
|
|
int timeout;
|
|
|
|
if (!getsockaddrarg(s, addro, &addr, &addrlen))
|
|
return NULL;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = internal_connect(s, addr, addrlen, &timeout);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return NULL;
|
|
}
|
|
if (res != 0)
|
|
return s->errorhandler();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(connect_doc,
|
|
"connect(address)\n\
|
|
\n\
|
|
Connect the socket to a remote address. For IP sockets, the address\n\
|
|
is a pair (host, port).");
|
|
|
|
|
|
/* s.connect_ex(sockaddr) method */
|
|
|
|
static PyObject *
|
|
sock_connect_ex(PySocketSockObject *s, PyObject *addro)
|
|
{
|
|
struct sockaddr *addr;
|
|
int addrlen;
|
|
int res;
|
|
int timeout;
|
|
|
|
if (!getsockaddrarg(s, addro, &addr, &addrlen))
|
|
return NULL;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = internal_connect(s, addr, addrlen, &timeout);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
/* Signals are not errors (though they may raise exceptions). Adapted
|
|
from PyErr_SetFromErrnoWithFilenameObject(). */
|
|
#ifdef EINTR
|
|
if (res == EINTR && PyErr_CheckSignals())
|
|
return NULL;
|
|
#endif
|
|
|
|
return PyInt_FromLong((long) res);
|
|
}
|
|
|
|
PyDoc_STRVAR(connect_ex_doc,
|
|
"connect_ex(address) -> errno\n\
|
|
\n\
|
|
This is like connect(address), but returns an error code (the errno value)\n\
|
|
instead of raising an exception when an error occurs.");
|
|
|
|
|
|
/* s.fileno() method */
|
|
|
|
static PyObject *
|
|
sock_fileno(PySocketSockObject *s)
|
|
{
|
|
#if SIZEOF_SOCKET_T <= SIZEOF_LONG
|
|
return PyInt_FromLong((long) s->sock_fd);
|
|
#else
|
|
return PyLong_FromLongLong((PY_LONG_LONG)s->sock_fd);
|
|
#endif
|
|
}
|
|
|
|
PyDoc_STRVAR(fileno_doc,
|
|
"fileno() -> integer\n\
|
|
\n\
|
|
Return the integer file descriptor of the socket.");
|
|
|
|
|
|
#ifndef NO_DUP
|
|
/* s.dup() method */
|
|
|
|
static PyObject *
|
|
sock_dup(PySocketSockObject *s)
|
|
{
|
|
SOCKET_T newfd;
|
|
PyObject *sock;
|
|
|
|
newfd = dup(s->sock_fd);
|
|
if (newfd < 0)
|
|
return s->errorhandler();
|
|
sock = (PyObject *) new_sockobject(newfd,
|
|
s->sock_family,
|
|
s->sock_type,
|
|
s->sock_proto);
|
|
if (sock == NULL)
|
|
SOCKETCLOSE(newfd);
|
|
return sock;
|
|
}
|
|
|
|
PyDoc_STRVAR(dup_doc,
|
|
"dup() -> socket object\n\
|
|
\n\
|
|
Return a new socket object connected to the same system resource.");
|
|
|
|
#endif
|
|
|
|
|
|
/* s.getsockname() method */
|
|
|
|
static PyObject *
|
|
sock_getsockname(PySocketSockObject *s)
|
|
{
|
|
sock_addr_t addrbuf;
|
|
int res;
|
|
socklen_t addrlen;
|
|
|
|
if (!getsockaddrlen(s, &addrlen))
|
|
return NULL;
|
|
memset(&addrbuf, 0, addrlen);
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = getsockname(s->sock_fd, (struct sockaddr *) &addrbuf, &addrlen);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
return makesockaddr(s->sock_fd, (struct sockaddr *) &addrbuf, addrlen,
|
|
s->sock_proto);
|
|
}
|
|
|
|
PyDoc_STRVAR(getsockname_doc,
|
|
"getsockname() -> address info\n\
|
|
\n\
|
|
Return the address of the local endpoint. For IP sockets, the address\n\
|
|
info is a pair (hostaddr, port).");
|
|
|
|
|
|
#ifdef HAVE_GETPEERNAME /* Cray APP doesn't have this :-( */
|
|
/* s.getpeername() method */
|
|
|
|
static PyObject *
|
|
sock_getpeername(PySocketSockObject *s)
|
|
{
|
|
sock_addr_t addrbuf;
|
|
int res;
|
|
socklen_t addrlen;
|
|
|
|
if (!getsockaddrlen(s, &addrlen))
|
|
return NULL;
|
|
memset(&addrbuf, 0, addrlen);
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = getpeername(s->sock_fd, (struct sockaddr *) &addrbuf, &addrlen);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
return makesockaddr(s->sock_fd, (struct sockaddr *) &addrbuf, addrlen,
|
|
s->sock_proto);
|
|
}
|
|
|
|
PyDoc_STRVAR(getpeername_doc,
|
|
"getpeername() -> address info\n\
|
|
\n\
|
|
Return the address of the remote endpoint. For IP sockets, the address\n\
|
|
info is a pair (hostaddr, port).");
|
|
|
|
#endif /* HAVE_GETPEERNAME */
|
|
|
|
|
|
/* s.listen(n) method */
|
|
|
|
static PyObject *
|
|
sock_listen(PySocketSockObject *s, PyObject *arg)
|
|
{
|
|
int backlog;
|
|
int res;
|
|
|
|
backlog = PyInt_AsLong(arg);
|
|
if (backlog == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
if (backlog < 1)
|
|
backlog = 1;
|
|
res = listen(s->sock_fd, backlog);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(listen_doc,
|
|
"listen(backlog)\n\
|
|
\n\
|
|
Enable a server to accept connections. The backlog argument must be at\n\
|
|
least 1; it specifies the number of unaccepted connection that the system\n\
|
|
will allow before refusing new connections.");
|
|
|
|
|
|
#ifndef NO_DUP
|
|
/* s.makefile(mode) method.
|
|
Create a new open file object referring to a dupped version of
|
|
the socket's file descriptor. (The dup() call is necessary so
|
|
that the open file and socket objects may be closed independent
|
|
of each other.)
|
|
The mode argument specifies 'r' or 'w' passed to fdopen(). */
|
|
|
|
static PyObject *
|
|
sock_makefile(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
extern int fclose(FILE *);
|
|
char *mode = "r";
|
|
int bufsize = -1;
|
|
#ifdef MS_WIN32
|
|
Py_intptr_t fd;
|
|
#else
|
|
int fd;
|
|
#endif
|
|
FILE *fp;
|
|
PyObject *f;
|
|
#ifdef __VMS
|
|
char *mode_r = "r";
|
|
char *mode_w = "w";
|
|
#endif
|
|
|
|
if (!PyArg_ParseTuple(args, "|si:makefile", &mode, &bufsize))
|
|
return NULL;
|
|
#ifdef __VMS
|
|
if (strcmp(mode,"rb") == 0) {
|
|
mode = mode_r;
|
|
}
|
|
else {
|
|
if (strcmp(mode,"wb") == 0) {
|
|
mode = mode_w;
|
|
}
|
|
}
|
|
#endif
|
|
#ifdef MS_WIN32
|
|
if (((fd = _open_osfhandle(s->sock_fd, _O_BINARY)) < 0) ||
|
|
((fd = dup(fd)) < 0) || ((fp = fdopen(fd, mode)) == NULL))
|
|
#else
|
|
if ((fd = dup(s->sock_fd)) < 0 || (fp = fdopen(fd, mode)) == NULL)
|
|
#endif
|
|
{
|
|
if (fd >= 0)
|
|
SOCKETCLOSE(fd);
|
|
return s->errorhandler();
|
|
}
|
|
f = PyFile_FromFile(fp, "<socket>", mode, fclose);
|
|
if (f != NULL)
|
|
PyFile_SetBufSize(f, bufsize);
|
|
return f;
|
|
}
|
|
|
|
PyDoc_STRVAR(makefile_doc,
|
|
"makefile([mode[, buffersize]]) -> file object\n\
|
|
\n\
|
|
Return a regular file object corresponding to the socket.\n\
|
|
The mode and buffersize arguments are as for the built-in open() function.");
|
|
|
|
#endif /* NO_DUP */
|
|
|
|
/*
|
|
* This is the guts of the recv() and recv_into() methods, which reads into a
|
|
* char buffer. If you have any inc/def ref to do to the objects that contain
|
|
* the buffer, do it in the caller. This function returns the number of bytes
|
|
* succesfully read. If there was an error, it returns -1. Note that it is
|
|
* also possible that we return a number of bytes smaller than the request
|
|
* bytes.
|
|
*/
|
|
static ssize_t
|
|
sock_recv_guts(PySocketSockObject *s, char* cbuf, int len, int flags)
|
|
{
|
|
ssize_t outlen = -1;
|
|
int timeout;
|
|
#ifdef __VMS
|
|
int remaining;
|
|
char *read_buf;
|
|
#endif
|
|
|
|
if (!IS_SELECTABLE(s)) {
|
|
select_error();
|
|
return -1;
|
|
}
|
|
|
|
#ifndef __VMS
|
|
Py_BEGIN_ALLOW_THREADS
|
|
timeout = internal_select(s, 0);
|
|
if (!timeout)
|
|
outlen = recv(s->sock_fd, cbuf, len, flags);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return -1;
|
|
}
|
|
if (outlen < 0) {
|
|
/* Note: the call to errorhandler() ALWAYS indirectly returned
|
|
NULL, so ignore its return value */
|
|
s->errorhandler();
|
|
return -1;
|
|
}
|
|
#else
|
|
read_buf = cbuf;
|
|
remaining = len;
|
|
while (remaining != 0) {
|
|
unsigned int segment;
|
|
int nread = -1;
|
|
|
|
segment = remaining /SEGMENT_SIZE;
|
|
if (segment != 0) {
|
|
segment = SEGMENT_SIZE;
|
|
}
|
|
else {
|
|
segment = remaining;
|
|
}
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
timeout = internal_select(s, 0);
|
|
if (!timeout)
|
|
nread = recv(s->sock_fd, read_buf, segment, flags);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return -1;
|
|
}
|
|
if (nread < 0) {
|
|
s->errorhandler();
|
|
return -1;
|
|
}
|
|
if (nread != remaining) {
|
|
read_buf += nread;
|
|
break;
|
|
}
|
|
|
|
remaining -= segment;
|
|
read_buf += segment;
|
|
}
|
|
outlen = read_buf - cbuf;
|
|
#endif /* !__VMS */
|
|
|
|
return outlen;
|
|
}
|
|
|
|
|
|
/* s.recv(nbytes [,flags]) method */
|
|
|
|
static PyObject *
|
|
sock_recv(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
int recvlen, flags = 0;
|
|
ssize_t outlen;
|
|
PyObject *buf;
|
|
|
|
if (!PyArg_ParseTuple(args, "i|i:recv", &recvlen, &flags))
|
|
return NULL;
|
|
|
|
if (recvlen < 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"negative buffersize in recv");
|
|
return NULL;
|
|
}
|
|
|
|
/* Allocate a new string. */
|
|
buf = PyString_FromStringAndSize((char *) 0, recvlen);
|
|
if (buf == NULL)
|
|
return NULL;
|
|
|
|
/* Call the guts */
|
|
outlen = sock_recv_guts(s, PyString_AS_STRING(buf), recvlen, flags);
|
|
if (outlen < 0) {
|
|
/* An error occurred, release the string and return an
|
|
error. */
|
|
Py_DECREF(buf);
|
|
return NULL;
|
|
}
|
|
if (outlen != recvlen) {
|
|
/* We did not read as many bytes as we anticipated, resize the
|
|
string if possible and be succesful. */
|
|
if (_PyString_Resize(&buf, outlen) < 0)
|
|
/* Oopsy, not so succesful after all. */
|
|
return NULL;
|
|
}
|
|
|
|
return buf;
|
|
}
|
|
|
|
PyDoc_STRVAR(recv_doc,
|
|
"recv(buffersize[, flags]) -> data\n\
|
|
\n\
|
|
Receive up to buffersize bytes from the socket. For the optional flags\n\
|
|
argument, see the Unix manual. When no data is available, block until\n\
|
|
at least one byte is available or until the remote end is closed. When\n\
|
|
the remote end is closed and all data is read, return the empty string.");
|
|
|
|
|
|
/* s.recv_into(buffer, [nbytes [,flags]]) method */
|
|
|
|
static PyObject*
|
|
sock_recv_into(PySocketSockObject *s, PyObject *args, PyObject *kwds)
|
|
{
|
|
static char *kwlist[] = {"buffer", "nbytes", "flags", 0};
|
|
|
|
int recvlen = 0, flags = 0;
|
|
ssize_t readlen;
|
|
char *buf;
|
|
int buflen;
|
|
|
|
/* Get the buffer's memory */
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "w#|ii:recv", kwlist,
|
|
&buf, &buflen, &recvlen, &flags))
|
|
return NULL;
|
|
assert(buf != 0 && buflen > 0);
|
|
|
|
if (recvlen < 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"negative buffersize in recv");
|
|
return NULL;
|
|
}
|
|
if (recvlen == 0) {
|
|
/* If nbytes was not specified, use the buffer's length */
|
|
recvlen = buflen;
|
|
}
|
|
|
|
/* Check if the buffer is large enough */
|
|
if (buflen < recvlen) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"buffer too small for requested bytes");
|
|
return NULL;
|
|
}
|
|
|
|
/* Call the guts */
|
|
readlen = sock_recv_guts(s, buf, recvlen, flags);
|
|
if (readlen < 0) {
|
|
/* Return an error. */
|
|
return NULL;
|
|
}
|
|
|
|
/* Return the number of bytes read. Note that we do not do anything
|
|
special here in the case that readlen < recvlen. */
|
|
return PyInt_FromSsize_t(readlen);
|
|
}
|
|
|
|
PyDoc_STRVAR(recv_into_doc,
|
|
"recv_into(buffer, [nbytes[, flags]]) -> nbytes_read\n\
|
|
\n\
|
|
A version of recv() that stores its data into a buffer rather than creating \n\
|
|
a new string. Receive up to buffersize bytes from the socket. If buffersize \n\
|
|
is not specified (or 0), receive up to the size available in the given buffer.\n\
|
|
\n\
|
|
See recv() for documentation about the flags.");
|
|
|
|
|
|
/*
|
|
* This is the guts of the recv() and recv_into() methods, which reads into a
|
|
* char buffer. If you have any inc/def ref to do to the objects that contain
|
|
* the buffer, do it in the caller. This function returns the number of bytes
|
|
* succesfully read. If there was an error, it returns -1. Note that it is
|
|
* also possible that we return a number of bytes smaller than the request
|
|
* bytes.
|
|
*
|
|
* 'addr' is a return value for the address object. Note that you must decref
|
|
* it yourself.
|
|
*/
|
|
static ssize_t
|
|
sock_recvfrom_guts(PySocketSockObject *s, char* cbuf, int len, int flags,
|
|
PyObject** addr)
|
|
{
|
|
sock_addr_t addrbuf;
|
|
int timeout;
|
|
ssize_t n = -1;
|
|
socklen_t addrlen;
|
|
|
|
*addr = NULL;
|
|
|
|
if (!getsockaddrlen(s, &addrlen))
|
|
return -1;
|
|
|
|
if (!IS_SELECTABLE(s)) {
|
|
select_error();
|
|
return -1;
|
|
}
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
memset(&addrbuf, 0, addrlen);
|
|
timeout = internal_select(s, 0);
|
|
if (!timeout) {
|
|
#ifndef MS_WINDOWS
|
|
#if defined(PYOS_OS2) && !defined(PYCC_GCC)
|
|
n = recvfrom(s->sock_fd, cbuf, len, flags,
|
|
(struct sockaddr *) &addrbuf, &addrlen);
|
|
#else
|
|
n = recvfrom(s->sock_fd, cbuf, len, flags,
|
|
(void *) &addrbuf, &addrlen);
|
|
#endif
|
|
#else
|
|
n = recvfrom(s->sock_fd, cbuf, len, flags,
|
|
(struct sockaddr *) &addrbuf, &addrlen);
|
|
#endif
|
|
}
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return -1;
|
|
}
|
|
if (n < 0) {
|
|
s->errorhandler();
|
|
return -1;
|
|
}
|
|
|
|
if (!(*addr = makesockaddr(s->sock_fd, (struct sockaddr *) &addrbuf,
|
|
addrlen, s->sock_proto)))
|
|
return -1;
|
|
|
|
return n;
|
|
}
|
|
|
|
/* s.recvfrom(nbytes [,flags]) method */
|
|
|
|
static PyObject *
|
|
sock_recvfrom(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
PyObject *buf = NULL;
|
|
PyObject *addr = NULL;
|
|
PyObject *ret = NULL;
|
|
int recvlen, flags = 0;
|
|
ssize_t outlen;
|
|
|
|
if (!PyArg_ParseTuple(args, "i|i:recvfrom", &recvlen, &flags))
|
|
return NULL;
|
|
|
|
buf = PyString_FromStringAndSize((char *) 0, recvlen);
|
|
if (buf == NULL)
|
|
return NULL;
|
|
|
|
outlen = sock_recvfrom_guts(s, PyString_AS_STRING(buf),
|
|
recvlen, flags, &addr);
|
|
if (outlen < 0) {
|
|
goto finally;
|
|
}
|
|
|
|
if (outlen != recvlen) {
|
|
/* We did not read as many bytes as we anticipated, resize the
|
|
string if possible and be succesful. */
|
|
if (_PyString_Resize(&buf, outlen) < 0)
|
|
/* Oopsy, not so succesful after all. */
|
|
goto finally;
|
|
}
|
|
|
|
ret = PyTuple_Pack(2, buf, addr);
|
|
|
|
finally:
|
|
Py_XDECREF(buf);
|
|
Py_XDECREF(addr);
|
|
return ret;
|
|
}
|
|
|
|
PyDoc_STRVAR(recvfrom_doc,
|
|
"recvfrom(buffersize[, flags]) -> (data, address info)\n\
|
|
\n\
|
|
Like recv(buffersize, flags) but also return the sender's address info.");
|
|
|
|
|
|
/* s.recvfrom_into(buffer[, nbytes [,flags]]) method */
|
|
|
|
static PyObject *
|
|
sock_recvfrom_into(PySocketSockObject *s, PyObject *args, PyObject* kwds)
|
|
{
|
|
static char *kwlist[] = {"buffer", "nbytes", "flags", 0};
|
|
|
|
int recvlen = 0, flags = 0;
|
|
ssize_t readlen;
|
|
char *buf;
|
|
int buflen;
|
|
|
|
PyObject *addr = NULL;
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "w#|ii:recvfrom", kwlist,
|
|
&buf, &buflen, &recvlen, &flags))
|
|
return NULL;
|
|
assert(buf != 0 && buflen > 0);
|
|
|
|
if (recvlen < 0) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"negative buffersize in recv");
|
|
return NULL;
|
|
}
|
|
if (recvlen == 0) {
|
|
/* If nbytes was not specified, use the buffer's length */
|
|
recvlen = buflen;
|
|
}
|
|
|
|
readlen = sock_recvfrom_guts(s, buf, recvlen, flags, &addr);
|
|
if (readlen < 0) {
|
|
/* Return an error */
|
|
Py_XDECREF(addr);
|
|
return NULL;
|
|
}
|
|
|
|
/* Return the number of bytes read and the address. Note that we do
|
|
not do anything special here in the case that readlen < recvlen. */
|
|
return Py_BuildValue("lN", readlen, addr);
|
|
}
|
|
|
|
PyDoc_STRVAR(recvfrom_into_doc,
|
|
"recvfrom_into(buffer[, nbytes[, flags]]) -> (nbytes, address info)\n\
|
|
\n\
|
|
Like recv_into(buffer[, nbytes[, flags]]) but also return the sender's address info.");
|
|
|
|
|
|
/* s.send(data [,flags]) method */
|
|
|
|
static PyObject *
|
|
sock_send(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
char *buf;
|
|
int len, n = -1, flags = 0, timeout;
|
|
|
|
if (!PyArg_ParseTuple(args, "s#|i:send", &buf, &len, &flags))
|
|
return NULL;
|
|
|
|
if (!IS_SELECTABLE(s))
|
|
return select_error();
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
timeout = internal_select(s, 1);
|
|
if (!timeout)
|
|
#ifdef __VMS
|
|
n = sendsegmented(s->sock_fd, buf, len, flags);
|
|
#else
|
|
n = send(s->sock_fd, buf, len, flags);
|
|
#endif
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return NULL;
|
|
}
|
|
if (n < 0)
|
|
return s->errorhandler();
|
|
return PyInt_FromLong((long)n);
|
|
}
|
|
|
|
PyDoc_STRVAR(send_doc,
|
|
"send(data[, flags]) -> count\n\
|
|
\n\
|
|
Send a data string to the socket. For the optional flags\n\
|
|
argument, see the Unix manual. Return the number of bytes\n\
|
|
sent; this may be less than len(data) if the network is busy.");
|
|
|
|
|
|
/* s.sendall(data [,flags]) method */
|
|
|
|
static PyObject *
|
|
sock_sendall(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
char *buf;
|
|
int len, n = -1, flags = 0, timeout;
|
|
|
|
if (!PyArg_ParseTuple(args, "s#|i:sendall", &buf, &len, &flags))
|
|
return NULL;
|
|
|
|
if (!IS_SELECTABLE(s))
|
|
return select_error();
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
do {
|
|
timeout = internal_select(s, 1);
|
|
n = -1;
|
|
if (timeout)
|
|
break;
|
|
#ifdef __VMS
|
|
n = sendsegmented(s->sock_fd, buf, len, flags);
|
|
#else
|
|
n = send(s->sock_fd, buf, len, flags);
|
|
#endif
|
|
if (n < 0)
|
|
break;
|
|
buf += n;
|
|
len -= n;
|
|
} while (len > 0);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return NULL;
|
|
}
|
|
if (n < 0)
|
|
return s->errorhandler();
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(sendall_doc,
|
|
"sendall(data[, flags])\n\
|
|
\n\
|
|
Send a data string to the socket. For the optional flags\n\
|
|
argument, see the Unix manual. This calls send() repeatedly\n\
|
|
until all data is sent. If an error occurs, it's impossible\n\
|
|
to tell how much data has been sent.");
|
|
|
|
|
|
/* s.sendto(data, [flags,] sockaddr) method */
|
|
|
|
static PyObject *
|
|
sock_sendto(PySocketSockObject *s, PyObject *args)
|
|
{
|
|
PyObject *addro;
|
|
char *buf;
|
|
struct sockaddr *addr;
|
|
int addrlen, len, n = -1, flags, timeout;
|
|
|
|
flags = 0;
|
|
if (!PyArg_ParseTuple(args, "s#O:sendto", &buf, &len, &addro)) {
|
|
PyErr_Clear();
|
|
if (!PyArg_ParseTuple(args, "s#iO:sendto",
|
|
&buf, &len, &flags, &addro))
|
|
return NULL;
|
|
}
|
|
|
|
if (!getsockaddrarg(s, addro, &addr, &addrlen))
|
|
return NULL;
|
|
|
|
if (!IS_SELECTABLE(s))
|
|
return select_error();
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
timeout = internal_select(s, 1);
|
|
if (!timeout)
|
|
n = sendto(s->sock_fd, buf, len, flags, addr, addrlen);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
if (timeout == 1) {
|
|
PyErr_SetString(socket_timeout, "timed out");
|
|
return NULL;
|
|
}
|
|
if (n < 0)
|
|
return s->errorhandler();
|
|
return PyInt_FromLong((long)n);
|
|
}
|
|
|
|
PyDoc_STRVAR(sendto_doc,
|
|
"sendto(data[, flags], address) -> count\n\
|
|
\n\
|
|
Like send(data, flags) but allows specifying the destination address.\n\
|
|
For IP sockets, the address is a pair (hostaddr, port).");
|
|
|
|
|
|
/* s.shutdown(how) method */
|
|
|
|
static PyObject *
|
|
sock_shutdown(PySocketSockObject *s, PyObject *arg)
|
|
{
|
|
int how;
|
|
int res;
|
|
|
|
how = PyInt_AsLong(arg);
|
|
if (how == -1 && PyErr_Occurred())
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = shutdown(s->sock_fd, how);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return s->errorhandler();
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(shutdown_doc,
|
|
"shutdown(flag)\n\
|
|
\n\
|
|
Shut down the reading side of the socket (flag == SHUT_RD), the writing side\n\
|
|
of the socket (flag == SHUT_WR), or both ends (flag == SHUT_RDWR).");
|
|
|
|
|
|
/* List of methods for socket objects */
|
|
|
|
static PyMethodDef sock_methods[] = {
|
|
{"accept", (PyCFunction)sock_accept, METH_NOARGS,
|
|
accept_doc},
|
|
{"bind", (PyCFunction)sock_bind, METH_O,
|
|
bind_doc},
|
|
{"close", (PyCFunction)sock_close, METH_NOARGS,
|
|
close_doc},
|
|
{"connect", (PyCFunction)sock_connect, METH_O,
|
|
connect_doc},
|
|
{"connect_ex", (PyCFunction)sock_connect_ex, METH_O,
|
|
connect_ex_doc},
|
|
#ifndef NO_DUP
|
|
{"dup", (PyCFunction)sock_dup, METH_NOARGS,
|
|
dup_doc},
|
|
#endif
|
|
{"fileno", (PyCFunction)sock_fileno, METH_NOARGS,
|
|
fileno_doc},
|
|
#ifdef HAVE_GETPEERNAME
|
|
{"getpeername", (PyCFunction)sock_getpeername,
|
|
METH_NOARGS, getpeername_doc},
|
|
#endif
|
|
{"getsockname", (PyCFunction)sock_getsockname,
|
|
METH_NOARGS, getsockname_doc},
|
|
{"getsockopt", (PyCFunction)sock_getsockopt, METH_VARARGS,
|
|
getsockopt_doc},
|
|
{"listen", (PyCFunction)sock_listen, METH_O,
|
|
listen_doc},
|
|
#ifndef NO_DUP
|
|
{"makefile", (PyCFunction)sock_makefile, METH_VARARGS,
|
|
makefile_doc},
|
|
#endif
|
|
{"recv", (PyCFunction)sock_recv, METH_VARARGS,
|
|
recv_doc},
|
|
{"recv_into", (PyCFunction)sock_recv_into, METH_VARARGS | METH_KEYWORDS,
|
|
recv_into_doc},
|
|
{"recvfrom", (PyCFunction)sock_recvfrom, METH_VARARGS,
|
|
recvfrom_doc},
|
|
{"recvfrom_into", (PyCFunction)sock_recvfrom_into, METH_VARARGS | METH_KEYWORDS,
|
|
recvfrom_into_doc},
|
|
{"send", (PyCFunction)sock_send, METH_VARARGS,
|
|
send_doc},
|
|
{"sendall", (PyCFunction)sock_sendall, METH_VARARGS,
|
|
sendall_doc},
|
|
{"sendto", (PyCFunction)sock_sendto, METH_VARARGS,
|
|
sendto_doc},
|
|
{"setblocking", (PyCFunction)sock_setblocking, METH_O,
|
|
setblocking_doc},
|
|
{"settimeout", (PyCFunction)sock_settimeout, METH_O,
|
|
settimeout_doc},
|
|
{"gettimeout", (PyCFunction)sock_gettimeout, METH_NOARGS,
|
|
gettimeout_doc},
|
|
{"setsockopt", (PyCFunction)sock_setsockopt, METH_VARARGS,
|
|
setsockopt_doc},
|
|
{"shutdown", (PyCFunction)sock_shutdown, METH_O,
|
|
shutdown_doc},
|
|
#ifdef RISCOS
|
|
{"sleeptaskw", (PyCFunction)sock_sleeptaskw, METH_O,
|
|
sleeptaskw_doc},
|
|
#endif
|
|
{NULL, NULL} /* sentinel */
|
|
};
|
|
|
|
/* SockObject members */
|
|
static PyMemberDef sock_memberlist[] = {
|
|
{"family", T_INT, offsetof(PySocketSockObject, sock_family), READONLY, "the socket family"},
|
|
{"type", T_INT, offsetof(PySocketSockObject, sock_type), READONLY, "the socket type"},
|
|
{"proto", T_INT, offsetof(PySocketSockObject, sock_proto), READONLY, "the socket protocol"},
|
|
{"timeout", T_DOUBLE, offsetof(PySocketSockObject, sock_timeout), READONLY, "the socket timeout"},
|
|
{0},
|
|
};
|
|
|
|
/* Deallocate a socket object in response to the last Py_DECREF().
|
|
First close the file description. */
|
|
|
|
static void
|
|
sock_dealloc(PySocketSockObject *s)
|
|
{
|
|
if (s->sock_fd != -1)
|
|
(void) SOCKETCLOSE(s->sock_fd);
|
|
s->ob_type->tp_free((PyObject *)s);
|
|
}
|
|
|
|
|
|
static PyObject *
|
|
sock_repr(PySocketSockObject *s)
|
|
{
|
|
char buf[512];
|
|
#if SIZEOF_SOCKET_T > SIZEOF_LONG
|
|
if (s->sock_fd > LONG_MAX) {
|
|
/* this can occur on Win64, and actually there is a special
|
|
ugly printf formatter for decimal pointer length integer
|
|
printing, only bother if necessary*/
|
|
PyErr_SetString(PyExc_OverflowError,
|
|
"no printf formatter to display "
|
|
"the socket descriptor in decimal");
|
|
return NULL;
|
|
}
|
|
#endif
|
|
PyOS_snprintf(
|
|
buf, sizeof(buf),
|
|
"<socket object, fd=%ld, family=%d, type=%d, protocol=%d>",
|
|
(long)s->sock_fd, s->sock_family,
|
|
s->sock_type,
|
|
s->sock_proto);
|
|
return PyString_FromString(buf);
|
|
}
|
|
|
|
|
|
/* Create a new, uninitialized socket object. */
|
|
|
|
static PyObject *
|
|
sock_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
|
|
{
|
|
PyObject *new;
|
|
|
|
new = type->tp_alloc(type, 0);
|
|
if (new != NULL) {
|
|
((PySocketSockObject *)new)->sock_fd = -1;
|
|
((PySocketSockObject *)new)->sock_timeout = -1.0;
|
|
((PySocketSockObject *)new)->errorhandler = &set_error;
|
|
}
|
|
return new;
|
|
}
|
|
|
|
|
|
/* Initialize a new socket object. */
|
|
|
|
/*ARGSUSED*/
|
|
static int
|
|
sock_initobj(PyObject *self, PyObject *args, PyObject *kwds)
|
|
{
|
|
PySocketSockObject *s = (PySocketSockObject *)self;
|
|
SOCKET_T fd;
|
|
int family = AF_INET, type = SOCK_STREAM, proto = 0;
|
|
static char *keywords[] = {"family", "type", "proto", 0};
|
|
|
|
if (!PyArg_ParseTupleAndKeywords(args, kwds,
|
|
"|iii:socket", keywords,
|
|
&family, &type, &proto))
|
|
return -1;
|
|
|
|
Py_BEGIN_ALLOW_THREADS
|
|
fd = socket(family, type, proto);
|
|
Py_END_ALLOW_THREADS
|
|
|
|
#ifdef MS_WINDOWS
|
|
if (fd == INVALID_SOCKET)
|
|
#else
|
|
if (fd < 0)
|
|
#endif
|
|
{
|
|
set_error();
|
|
return -1;
|
|
}
|
|
init_sockobject(s, fd, family, type, proto);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
/* Type object for socket objects. */
|
|
|
|
static PyTypeObject sock_type = {
|
|
PyObject_HEAD_INIT(0) /* Must fill in type value later */
|
|
0, /* ob_size */
|
|
"_socket.socket", /* tp_name */
|
|
sizeof(PySocketSockObject), /* tp_basicsize */
|
|
0, /* tp_itemsize */
|
|
(destructor)sock_dealloc, /* tp_dealloc */
|
|
0, /* tp_print */
|
|
0, /* tp_getattr */
|
|
0, /* tp_setattr */
|
|
0, /* tp_compare */
|
|
(reprfunc)sock_repr, /* tp_repr */
|
|
0, /* tp_as_number */
|
|
0, /* tp_as_sequence */
|
|
0, /* tp_as_mapping */
|
|
0, /* tp_hash */
|
|
0, /* tp_call */
|
|
0, /* tp_str */
|
|
PyObject_GenericGetAttr, /* tp_getattro */
|
|
0, /* tp_setattro */
|
|
0, /* tp_as_buffer */
|
|
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, /* tp_flags */
|
|
sock_doc, /* tp_doc */
|
|
0, /* tp_traverse */
|
|
0, /* tp_clear */
|
|
0, /* tp_richcompare */
|
|
0, /* tp_weaklistoffset */
|
|
0, /* tp_iter */
|
|
0, /* tp_iternext */
|
|
sock_methods, /* tp_methods */
|
|
sock_memberlist, /* tp_members */
|
|
0, /* tp_getset */
|
|
0, /* tp_base */
|
|
0, /* tp_dict */
|
|
0, /* tp_descr_get */
|
|
0, /* tp_descr_set */
|
|
0, /* tp_dictoffset */
|
|
sock_initobj, /* tp_init */
|
|
PyType_GenericAlloc, /* tp_alloc */
|
|
sock_new, /* tp_new */
|
|
PyObject_Del, /* tp_free */
|
|
};
|
|
|
|
|
|
/* Python interface to gethostname(). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_gethostname(PyObject *self, PyObject *unused)
|
|
{
|
|
char buf[1024];
|
|
int res;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
res = gethostname(buf, (int) sizeof buf - 1);
|
|
Py_END_ALLOW_THREADS
|
|
if (res < 0)
|
|
return set_error();
|
|
buf[sizeof buf - 1] = '\0';
|
|
return PyString_FromString(buf);
|
|
}
|
|
|
|
PyDoc_STRVAR(gethostname_doc,
|
|
"gethostname() -> string\n\
|
|
\n\
|
|
Return the current host name.");
|
|
|
|
|
|
/* Python interface to gethostbyname(name). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_gethostbyname(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
sock_addr_t addrbuf;
|
|
|
|
if (!PyArg_ParseTuple(args, "s:gethostbyname", &name))
|
|
return NULL;
|
|
if (setipaddr(name, (struct sockaddr *)&addrbuf, sizeof(addrbuf), AF_INET) < 0)
|
|
return NULL;
|
|
return makeipaddr((struct sockaddr *)&addrbuf,
|
|
sizeof(struct sockaddr_in));
|
|
}
|
|
|
|
PyDoc_STRVAR(gethostbyname_doc,
|
|
"gethostbyname(host) -> address\n\
|
|
\n\
|
|
Return the IP address (a string of the form '255.255.255.255') for a host.");
|
|
|
|
|
|
/* Convenience function common to gethostbyname_ex and gethostbyaddr */
|
|
|
|
static PyObject *
|
|
gethost_common(struct hostent *h, struct sockaddr *addr, int alen, int af)
|
|
{
|
|
char **pch;
|
|
PyObject *rtn_tuple = (PyObject *)NULL;
|
|
PyObject *name_list = (PyObject *)NULL;
|
|
PyObject *addr_list = (PyObject *)NULL;
|
|
PyObject *tmp;
|
|
|
|
if (h == NULL) {
|
|
/* Let's get real error message to return */
|
|
#ifndef RISCOS
|
|
set_herror(h_errno);
|
|
#else
|
|
PyErr_SetString(socket_error, "host not found");
|
|
#endif
|
|
return NULL;
|
|
}
|
|
|
|
if (h->h_addrtype != af) {
|
|
#ifdef HAVE_STRERROR
|
|
/* Let's get real error message to return */
|
|
PyErr_SetString(socket_error,
|
|
(char *)strerror(EAFNOSUPPORT));
|
|
#else
|
|
PyErr_SetString(
|
|
socket_error,
|
|
"Address family not supported by protocol family");
|
|
#endif
|
|
return NULL;
|
|
}
|
|
|
|
switch (af) {
|
|
|
|
case AF_INET:
|
|
if (alen < sizeof(struct sockaddr_in))
|
|
return NULL;
|
|
break;
|
|
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
if (alen < sizeof(struct sockaddr_in6))
|
|
return NULL;
|
|
break;
|
|
#endif
|
|
|
|
}
|
|
|
|
if ((name_list = PyList_New(0)) == NULL)
|
|
goto err;
|
|
|
|
if ((addr_list = PyList_New(0)) == NULL)
|
|
goto err;
|
|
|
|
for (pch = h->h_aliases; *pch != NULL; pch++) {
|
|
int status;
|
|
tmp = PyString_FromString(*pch);
|
|
if (tmp == NULL)
|
|
goto err;
|
|
|
|
status = PyList_Append(name_list, tmp);
|
|
Py_DECREF(tmp);
|
|
|
|
if (status)
|
|
goto err;
|
|
}
|
|
|
|
for (pch = h->h_addr_list; *pch != NULL; pch++) {
|
|
int status;
|
|
|
|
switch (af) {
|
|
|
|
case AF_INET:
|
|
{
|
|
struct sockaddr_in sin;
|
|
memset(&sin, 0, sizeof(sin));
|
|
sin.sin_family = af;
|
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
|
sin.sin_len = sizeof(sin);
|
|
#endif
|
|
memcpy(&sin.sin_addr, *pch, sizeof(sin.sin_addr));
|
|
tmp = makeipaddr((struct sockaddr *)&sin, sizeof(sin));
|
|
|
|
if (pch == h->h_addr_list && alen >= sizeof(sin))
|
|
memcpy((char *) addr, &sin, sizeof(sin));
|
|
break;
|
|
}
|
|
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
{
|
|
struct sockaddr_in6 sin6;
|
|
memset(&sin6, 0, sizeof(sin6));
|
|
sin6.sin6_family = af;
|
|
#ifdef HAVE_SOCKADDR_SA_LEN
|
|
sin6.sin6_len = sizeof(sin6);
|
|
#endif
|
|
memcpy(&sin6.sin6_addr, *pch, sizeof(sin6.sin6_addr));
|
|
tmp = makeipaddr((struct sockaddr *)&sin6,
|
|
sizeof(sin6));
|
|
|
|
if (pch == h->h_addr_list && alen >= sizeof(sin6))
|
|
memcpy((char *) addr, &sin6, sizeof(sin6));
|
|
break;
|
|
}
|
|
#endif
|
|
|
|
default: /* can't happen */
|
|
PyErr_SetString(socket_error,
|
|
"unsupported address family");
|
|
return NULL;
|
|
}
|
|
|
|
if (tmp == NULL)
|
|
goto err;
|
|
|
|
status = PyList_Append(addr_list, tmp);
|
|
Py_DECREF(tmp);
|
|
|
|
if (status)
|
|
goto err;
|
|
}
|
|
|
|
rtn_tuple = Py_BuildValue("sOO", h->h_name, name_list, addr_list);
|
|
|
|
err:
|
|
Py_XDECREF(name_list);
|
|
Py_XDECREF(addr_list);
|
|
return rtn_tuple;
|
|
}
|
|
|
|
|
|
/* Python interface to gethostbyname_ex(name). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_gethostbyname_ex(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
struct hostent *h;
|
|
#ifdef ENABLE_IPV6
|
|
struct sockaddr_storage addr;
|
|
#else
|
|
struct sockaddr_in addr;
|
|
#endif
|
|
struct sockaddr *sa;
|
|
PyObject *ret;
|
|
#ifdef HAVE_GETHOSTBYNAME_R
|
|
struct hostent hp_allocated;
|
|
#ifdef HAVE_GETHOSTBYNAME_R_3_ARG
|
|
struct hostent_data data;
|
|
#else
|
|
char buf[16384];
|
|
int buf_len = (sizeof buf) - 1;
|
|
int errnop;
|
|
#endif
|
|
#if defined(HAVE_GETHOSTBYNAME_R_3_ARG) || defined(HAVE_GETHOSTBYNAME_R_6_ARG)
|
|
int result;
|
|
#endif
|
|
#endif /* HAVE_GETHOSTBYNAME_R */
|
|
|
|
if (!PyArg_ParseTuple(args, "s:gethostbyname_ex", &name))
|
|
return NULL;
|
|
if (setipaddr(name, (struct sockaddr *)&addr, sizeof(addr), AF_INET) < 0)
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#ifdef HAVE_GETHOSTBYNAME_R
|
|
#if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
|
|
result = gethostbyname_r(name, &hp_allocated, buf, buf_len,
|
|
&h, &errnop);
|
|
#elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
|
|
h = gethostbyname_r(name, &hp_allocated, buf, buf_len, &errnop);
|
|
#else /* HAVE_GETHOSTBYNAME_R_3_ARG */
|
|
memset((void *) &data, '\0', sizeof(data));
|
|
result = gethostbyname_r(name, &hp_allocated, &data);
|
|
h = (result != 0) ? NULL : &hp_allocated;
|
|
#endif
|
|
#else /* not HAVE_GETHOSTBYNAME_R */
|
|
#ifdef USE_GETHOSTBYNAME_LOCK
|
|
PyThread_acquire_lock(netdb_lock, 1);
|
|
#endif
|
|
h = gethostbyname(name);
|
|
#endif /* HAVE_GETHOSTBYNAME_R */
|
|
Py_END_ALLOW_THREADS
|
|
/* Some C libraries would require addr.__ss_family instead of
|
|
addr.ss_family.
|
|
Therefore, we cast the sockaddr_storage into sockaddr to
|
|
access sa_family. */
|
|
sa = (struct sockaddr*)&addr;
|
|
ret = gethost_common(h, (struct sockaddr *)&addr, sizeof(addr),
|
|
sa->sa_family);
|
|
#ifdef USE_GETHOSTBYNAME_LOCK
|
|
PyThread_release_lock(netdb_lock);
|
|
#endif
|
|
return ret;
|
|
}
|
|
|
|
PyDoc_STRVAR(ghbn_ex_doc,
|
|
"gethostbyname_ex(host) -> (name, aliaslist, addresslist)\n\
|
|
\n\
|
|
Return the true host name, a list of aliases, and a list of IP addresses,\n\
|
|
for a host. The host argument is a string giving a host name or IP number.");
|
|
|
|
|
|
/* Python interface to gethostbyaddr(IP). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_gethostbyaddr(PyObject *self, PyObject *args)
|
|
{
|
|
#ifdef ENABLE_IPV6
|
|
struct sockaddr_storage addr;
|
|
#else
|
|
struct sockaddr_in addr;
|
|
#endif
|
|
struct sockaddr *sa = (struct sockaddr *)&addr;
|
|
char *ip_num;
|
|
struct hostent *h;
|
|
PyObject *ret;
|
|
#ifdef HAVE_GETHOSTBYNAME_R
|
|
struct hostent hp_allocated;
|
|
#ifdef HAVE_GETHOSTBYNAME_R_3_ARG
|
|
struct hostent_data data;
|
|
#else
|
|
char buf[16384];
|
|
int buf_len = (sizeof buf) - 1;
|
|
int errnop;
|
|
#endif
|
|
#if defined(HAVE_GETHOSTBYNAME_R_3_ARG) || defined(HAVE_GETHOSTBYNAME_R_6_ARG)
|
|
int result;
|
|
#endif
|
|
#endif /* HAVE_GETHOSTBYNAME_R */
|
|
char *ap;
|
|
int al;
|
|
int af;
|
|
|
|
if (!PyArg_ParseTuple(args, "s:gethostbyaddr", &ip_num))
|
|
return NULL;
|
|
af = AF_UNSPEC;
|
|
if (setipaddr(ip_num, sa, sizeof(addr), af) < 0)
|
|
return NULL;
|
|
af = sa->sa_family;
|
|
ap = NULL;
|
|
al = 0;
|
|
switch (af) {
|
|
case AF_INET:
|
|
ap = (char *)&((struct sockaddr_in *)sa)->sin_addr;
|
|
al = sizeof(((struct sockaddr_in *)sa)->sin_addr);
|
|
break;
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
ap = (char *)&((struct sockaddr_in6 *)sa)->sin6_addr;
|
|
al = sizeof(((struct sockaddr_in6 *)sa)->sin6_addr);
|
|
break;
|
|
#endif
|
|
default:
|
|
PyErr_SetString(socket_error, "unsupported address family");
|
|
return NULL;
|
|
}
|
|
Py_BEGIN_ALLOW_THREADS
|
|
#ifdef HAVE_GETHOSTBYNAME_R
|
|
#if defined(HAVE_GETHOSTBYNAME_R_6_ARG)
|
|
result = gethostbyaddr_r(ap, al, af,
|
|
&hp_allocated, buf, buf_len,
|
|
&h, &errnop);
|
|
#elif defined(HAVE_GETHOSTBYNAME_R_5_ARG)
|
|
h = gethostbyaddr_r(ap, al, af,
|
|
&hp_allocated, buf, buf_len, &errnop);
|
|
#else /* HAVE_GETHOSTBYNAME_R_3_ARG */
|
|
memset((void *) &data, '\0', sizeof(data));
|
|
result = gethostbyaddr_r(ap, al, af, &hp_allocated, &data);
|
|
h = (result != 0) ? NULL : &hp_allocated;
|
|
#endif
|
|
#else /* not HAVE_GETHOSTBYNAME_R */
|
|
#ifdef USE_GETHOSTBYNAME_LOCK
|
|
PyThread_acquire_lock(netdb_lock, 1);
|
|
#endif
|
|
h = gethostbyaddr(ap, al, af);
|
|
#endif /* HAVE_GETHOSTBYNAME_R */
|
|
Py_END_ALLOW_THREADS
|
|
ret = gethost_common(h, (struct sockaddr *)&addr, sizeof(addr), af);
|
|
#ifdef USE_GETHOSTBYNAME_LOCK
|
|
PyThread_release_lock(netdb_lock);
|
|
#endif
|
|
return ret;
|
|
}
|
|
|
|
PyDoc_STRVAR(gethostbyaddr_doc,
|
|
"gethostbyaddr(host) -> (name, aliaslist, addresslist)\n\
|
|
\n\
|
|
Return the true host name, a list of aliases, and a list of IP addresses,\n\
|
|
for a host. The host argument is a string giving a host name or IP number.");
|
|
|
|
|
|
/* Python interface to getservbyname(name).
|
|
This only returns the port number, since the other info is already
|
|
known or not useful (like the list of aliases). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_getservbyname(PyObject *self, PyObject *args)
|
|
{
|
|
char *name, *proto=NULL;
|
|
struct servent *sp;
|
|
if (!PyArg_ParseTuple(args, "s|s:getservbyname", &name, &proto))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
sp = getservbyname(name, proto);
|
|
Py_END_ALLOW_THREADS
|
|
if (sp == NULL) {
|
|
PyErr_SetString(socket_error, "service/proto not found");
|
|
return NULL;
|
|
}
|
|
return PyInt_FromLong((long) ntohs(sp->s_port));
|
|
}
|
|
|
|
PyDoc_STRVAR(getservbyname_doc,
|
|
"getservbyname(servicename[, protocolname]) -> integer\n\
|
|
\n\
|
|
Return a port number from a service name and protocol name.\n\
|
|
The optional protocol name, if given, should be 'tcp' or 'udp',\n\
|
|
otherwise any protocol will match.");
|
|
|
|
|
|
/* Python interface to getservbyport(port).
|
|
This only returns the service name, since the other info is already
|
|
known or not useful (like the list of aliases). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_getservbyport(PyObject *self, PyObject *args)
|
|
{
|
|
unsigned short port;
|
|
char *proto=NULL;
|
|
struct servent *sp;
|
|
if (!PyArg_ParseTuple(args, "H|s:getservbyport", &port, &proto))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
sp = getservbyport(htons(port), proto);
|
|
Py_END_ALLOW_THREADS
|
|
if (sp == NULL) {
|
|
PyErr_SetString(socket_error, "port/proto not found");
|
|
return NULL;
|
|
}
|
|
return PyString_FromString(sp->s_name);
|
|
}
|
|
|
|
PyDoc_STRVAR(getservbyport_doc,
|
|
"getservbyport(port[, protocolname]) -> string\n\
|
|
\n\
|
|
Return the service name from a port number and protocol name.\n\
|
|
The optional protocol name, if given, should be 'tcp' or 'udp',\n\
|
|
otherwise any protocol will match.");
|
|
|
|
/* Python interface to getprotobyname(name).
|
|
This only returns the protocol number, since the other info is
|
|
already known or not useful (like the list of aliases). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_getprotobyname(PyObject *self, PyObject *args)
|
|
{
|
|
char *name;
|
|
struct protoent *sp;
|
|
#ifdef __BEOS__
|
|
/* Not available in BeOS yet. - [cjh] */
|
|
PyErr_SetString(socket_error, "getprotobyname not supported");
|
|
return NULL;
|
|
#else
|
|
if (!PyArg_ParseTuple(args, "s:getprotobyname", &name))
|
|
return NULL;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
sp = getprotobyname(name);
|
|
Py_END_ALLOW_THREADS
|
|
if (sp == NULL) {
|
|
PyErr_SetString(socket_error, "protocol not found");
|
|
return NULL;
|
|
}
|
|
return PyInt_FromLong((long) sp->p_proto);
|
|
#endif
|
|
}
|
|
|
|
PyDoc_STRVAR(getprotobyname_doc,
|
|
"getprotobyname(name) -> integer\n\
|
|
\n\
|
|
Return the protocol number for the named protocol. (Rarely used.)");
|
|
|
|
|
|
#ifdef HAVE_SOCKETPAIR
|
|
/* Create a pair of sockets using the socketpair() function.
|
|
Arguments as for socket() except the default family is AF_UNIX if
|
|
defined on the platform; otherwise, the default is AF_INET. */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_socketpair(PyObject *self, PyObject *args)
|
|
{
|
|
PySocketSockObject *s0 = NULL, *s1 = NULL;
|
|
SOCKET_T sv[2];
|
|
int family, type = SOCK_STREAM, proto = 0;
|
|
PyObject *res = NULL;
|
|
|
|
#if defined(AF_UNIX)
|
|
family = AF_UNIX;
|
|
#else
|
|
family = AF_INET;
|
|
#endif
|
|
if (!PyArg_ParseTuple(args, "|iii:socketpair",
|
|
&family, &type, &proto))
|
|
return NULL;
|
|
/* Create a pair of socket fds */
|
|
if (socketpair(family, type, proto, sv) < 0)
|
|
return set_error();
|
|
s0 = new_sockobject(sv[0], family, type, proto);
|
|
if (s0 == NULL)
|
|
goto finally;
|
|
s1 = new_sockobject(sv[1], family, type, proto);
|
|
if (s1 == NULL)
|
|
goto finally;
|
|
res = PyTuple_Pack(2, s0, s1);
|
|
|
|
finally:
|
|
if (res == NULL) {
|
|
if (s0 == NULL)
|
|
SOCKETCLOSE(sv[0]);
|
|
if (s1 == NULL)
|
|
SOCKETCLOSE(sv[1]);
|
|
}
|
|
Py_XDECREF(s0);
|
|
Py_XDECREF(s1);
|
|
return res;
|
|
}
|
|
|
|
PyDoc_STRVAR(socketpair_doc,
|
|
"socketpair([family[, type[, proto]]]) -> (socket object, socket object)\n\
|
|
\n\
|
|
Create a pair of socket objects from the sockets returned by the platform\n\
|
|
socketpair() function.\n\
|
|
The arguments are the same as for socket() except the default family is\n\
|
|
AF_UNIX if defined on the platform; otherwise, the default is AF_INET.");
|
|
|
|
#endif /* HAVE_SOCKETPAIR */
|
|
|
|
|
|
#ifndef NO_DUP
|
|
/* Create a socket object from a numeric file description.
|
|
Useful e.g. if stdin is a socket.
|
|
Additional arguments as for socket(). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_fromfd(PyObject *self, PyObject *args)
|
|
{
|
|
PySocketSockObject *s;
|
|
SOCKET_T fd;
|
|
int family, type, proto = 0;
|
|
if (!PyArg_ParseTuple(args, "iii|i:fromfd",
|
|
&fd, &family, &type, &proto))
|
|
return NULL;
|
|
/* Dup the fd so it and the socket can be closed independently */
|
|
fd = dup(fd);
|
|
if (fd < 0)
|
|
return set_error();
|
|
s = new_sockobject(fd, family, type, proto);
|
|
return (PyObject *) s;
|
|
}
|
|
|
|
PyDoc_STRVAR(fromfd_doc,
|
|
"fromfd(fd, family, type[, proto]) -> socket object\n\
|
|
\n\
|
|
Create a socket object from a duplicate of the given\n\
|
|
file descriptor.\n\
|
|
The remaining arguments are the same as for socket().");
|
|
|
|
#endif /* NO_DUP */
|
|
|
|
|
|
static PyObject *
|
|
socket_ntohs(PyObject *self, PyObject *args)
|
|
{
|
|
int x1, x2;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:ntohs", &x1)) {
|
|
return NULL;
|
|
}
|
|
x2 = (int)ntohs((short)x1);
|
|
return PyInt_FromLong(x2);
|
|
}
|
|
|
|
PyDoc_STRVAR(ntohs_doc,
|
|
"ntohs(integer) -> integer\n\
|
|
\n\
|
|
Convert a 16-bit integer from network to host byte order.");
|
|
|
|
|
|
static PyObject *
|
|
socket_ntohl(PyObject *self, PyObject *arg)
|
|
{
|
|
unsigned long x;
|
|
|
|
if (PyInt_Check(arg)) {
|
|
x = PyInt_AS_LONG(arg);
|
|
if (x == (unsigned long) -1 && PyErr_Occurred())
|
|
return NULL;
|
|
}
|
|
else if (PyLong_Check(arg)) {
|
|
x = PyLong_AsUnsignedLong(arg);
|
|
if (x == (unsigned long) -1 && PyErr_Occurred())
|
|
return NULL;
|
|
#if SIZEOF_LONG > 4
|
|
{
|
|
unsigned long y;
|
|
/* only want the trailing 32 bits */
|
|
y = x & 0xFFFFFFFFUL;
|
|
if (y ^ x)
|
|
return PyErr_Format(PyExc_OverflowError,
|
|
"long int larger than 32 bits");
|
|
x = y;
|
|
}
|
|
#endif
|
|
}
|
|
else
|
|
return PyErr_Format(PyExc_TypeError,
|
|
"expected int/long, %s found",
|
|
arg->ob_type->tp_name);
|
|
if (x == (unsigned long) -1 && PyErr_Occurred())
|
|
return NULL;
|
|
return PyInt_FromLong(ntohl(x));
|
|
}
|
|
|
|
PyDoc_STRVAR(ntohl_doc,
|
|
"ntohl(integer) -> integer\n\
|
|
\n\
|
|
Convert a 32-bit integer from network to host byte order.");
|
|
|
|
|
|
static PyObject *
|
|
socket_htons(PyObject *self, PyObject *args)
|
|
{
|
|
int x1, x2;
|
|
|
|
if (!PyArg_ParseTuple(args, "i:htons", &x1)) {
|
|
return NULL;
|
|
}
|
|
x2 = (int)htons((short)x1);
|
|
return PyInt_FromLong(x2);
|
|
}
|
|
|
|
PyDoc_STRVAR(htons_doc,
|
|
"htons(integer) -> integer\n\
|
|
\n\
|
|
Convert a 16-bit integer from host to network byte order.");
|
|
|
|
|
|
static PyObject *
|
|
socket_htonl(PyObject *self, PyObject *arg)
|
|
{
|
|
unsigned long x;
|
|
|
|
if (PyInt_Check(arg)) {
|
|
x = PyInt_AS_LONG(arg);
|
|
if (x == (unsigned long) -1 && PyErr_Occurred())
|
|
return NULL;
|
|
}
|
|
else if (PyLong_Check(arg)) {
|
|
x = PyLong_AsUnsignedLong(arg);
|
|
if (x == (unsigned long) -1 && PyErr_Occurred())
|
|
return NULL;
|
|
#if SIZEOF_LONG > 4
|
|
{
|
|
unsigned long y;
|
|
/* only want the trailing 32 bits */
|
|
y = x & 0xFFFFFFFFUL;
|
|
if (y ^ x)
|
|
return PyErr_Format(PyExc_OverflowError,
|
|
"long int larger than 32 bits");
|
|
x = y;
|
|
}
|
|
#endif
|
|
}
|
|
else
|
|
return PyErr_Format(PyExc_TypeError,
|
|
"expected int/long, %s found",
|
|
arg->ob_type->tp_name);
|
|
return PyInt_FromLong(htonl(x));
|
|
}
|
|
|
|
PyDoc_STRVAR(htonl_doc,
|
|
"htonl(integer) -> integer\n\
|
|
\n\
|
|
Convert a 32-bit integer from host to network byte order.");
|
|
|
|
/* socket.inet_aton() and socket.inet_ntoa() functions. */
|
|
|
|
PyDoc_STRVAR(inet_aton_doc,
|
|
"inet_aton(string) -> packed 32-bit IP representation\n\
|
|
\n\
|
|
Convert an IP address in string format (123.45.67.89) to the 32-bit packed\n\
|
|
binary format used in low-level network functions.");
|
|
|
|
static PyObject*
|
|
socket_inet_aton(PyObject *self, PyObject *args)
|
|
{
|
|
#ifndef INADDR_NONE
|
|
#define INADDR_NONE (-1)
|
|
#endif
|
|
#ifdef HAVE_INET_ATON
|
|
struct in_addr buf;
|
|
#endif
|
|
|
|
#if !defined(HAVE_INET_ATON) || defined(USE_INET_ATON_WEAKLINK)
|
|
/* Have to use inet_addr() instead */
|
|
unsigned long packed_addr;
|
|
#endif
|
|
char *ip_addr;
|
|
|
|
if (!PyArg_ParseTuple(args, "s:inet_aton", &ip_addr))
|
|
return NULL;
|
|
|
|
|
|
#ifdef HAVE_INET_ATON
|
|
|
|
#ifdef USE_INET_ATON_WEAKLINK
|
|
if (inet_aton != NULL) {
|
|
#endif
|
|
if (inet_aton(ip_addr, &buf))
|
|
return PyString_FromStringAndSize((char *)(&buf),
|
|
sizeof(buf));
|
|
|
|
PyErr_SetString(socket_error,
|
|
"illegal IP address string passed to inet_aton");
|
|
return NULL;
|
|
|
|
#ifdef USE_INET_ATON_WEAKLINK
|
|
} else {
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#if !defined(HAVE_INET_ATON) || defined(USE_INET_ATON_WEAKLINK)
|
|
|
|
/* special-case this address as inet_addr might return INADDR_NONE
|
|
* for this */
|
|
if (strcmp(ip_addr, "255.255.255.255") == 0) {
|
|
packed_addr = 0xFFFFFFFF;
|
|
} else {
|
|
|
|
packed_addr = inet_addr(ip_addr);
|
|
|
|
if (packed_addr == INADDR_NONE) { /* invalid address */
|
|
PyErr_SetString(socket_error,
|
|
"illegal IP address string passed to inet_aton");
|
|
return NULL;
|
|
}
|
|
}
|
|
return PyString_FromStringAndSize((char *) &packed_addr,
|
|
sizeof(packed_addr));
|
|
|
|
#ifdef USE_INET_ATON_WEAKLINK
|
|
}
|
|
#endif
|
|
|
|
#endif
|
|
}
|
|
|
|
PyDoc_STRVAR(inet_ntoa_doc,
|
|
"inet_ntoa(packed_ip) -> ip_address_string\n\
|
|
\n\
|
|
Convert an IP address from 32-bit packed binary format to string format");
|
|
|
|
static PyObject*
|
|
socket_inet_ntoa(PyObject *self, PyObject *args)
|
|
{
|
|
char *packed_str;
|
|
int addr_len;
|
|
struct in_addr packed_addr;
|
|
|
|
if (!PyArg_ParseTuple(args, "s#:inet_ntoa", &packed_str, &addr_len)) {
|
|
return NULL;
|
|
}
|
|
|
|
if (addr_len != sizeof(packed_addr)) {
|
|
PyErr_SetString(socket_error,
|
|
"packed IP wrong length for inet_ntoa");
|
|
return NULL;
|
|
}
|
|
|
|
memcpy(&packed_addr, packed_str, addr_len);
|
|
|
|
return PyString_FromString(inet_ntoa(packed_addr));
|
|
}
|
|
|
|
#ifdef HAVE_INET_PTON
|
|
|
|
PyDoc_STRVAR(inet_pton_doc,
|
|
"inet_pton(af, ip) -> packed IP address string\n\
|
|
\n\
|
|
Convert an IP address from string format to a packed string suitable\n\
|
|
for use with low-level network functions.");
|
|
|
|
static PyObject *
|
|
socket_inet_pton(PyObject *self, PyObject *args)
|
|
{
|
|
int af;
|
|
char* ip;
|
|
int retval;
|
|
#ifdef ENABLE_IPV6
|
|
char packed[MAX(sizeof(struct in_addr), sizeof(struct in6_addr))];
|
|
#else
|
|
char packed[sizeof(struct in_addr)];
|
|
#endif
|
|
if (!PyArg_ParseTuple(args, "is:inet_pton", &af, &ip)) {
|
|
return NULL;
|
|
}
|
|
|
|
#if !defined(ENABLE_IPV6) && defined(AF_INET6)
|
|
if(af == AF_INET6) {
|
|
PyErr_SetString(socket_error,
|
|
"can't use AF_INET6, IPv6 is disabled");
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
retval = inet_pton(af, ip, packed);
|
|
if (retval < 0) {
|
|
PyErr_SetFromErrno(socket_error);
|
|
return NULL;
|
|
} else if (retval == 0) {
|
|
PyErr_SetString(socket_error,
|
|
"illegal IP address string passed to inet_pton");
|
|
return NULL;
|
|
} else if (af == AF_INET) {
|
|
return PyString_FromStringAndSize(packed,
|
|
sizeof(struct in_addr));
|
|
#ifdef ENABLE_IPV6
|
|
} else if (af == AF_INET6) {
|
|
return PyString_FromStringAndSize(packed,
|
|
sizeof(struct in6_addr));
|
|
#endif
|
|
} else {
|
|
PyErr_SetString(socket_error, "unknown address family");
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
PyDoc_STRVAR(inet_ntop_doc,
|
|
"inet_ntop(af, packed_ip) -> string formatted IP address\n\
|
|
\n\
|
|
Convert a packed IP address of the given family to string format.");
|
|
|
|
static PyObject *
|
|
socket_inet_ntop(PyObject *self, PyObject *args)
|
|
{
|
|
int af;
|
|
char* packed;
|
|
int len;
|
|
const char* retval;
|
|
#ifdef ENABLE_IPV6
|
|
char ip[MAX(INET_ADDRSTRLEN, INET6_ADDRSTRLEN) + 1];
|
|
#else
|
|
char ip[INET_ADDRSTRLEN + 1];
|
|
#endif
|
|
|
|
/* Guarantee NUL-termination for PyString_FromString() below */
|
|
memset((void *) &ip[0], '\0', sizeof(ip));
|
|
|
|
if (!PyArg_ParseTuple(args, "is#:inet_ntop", &af, &packed, &len)) {
|
|
return NULL;
|
|
}
|
|
|
|
if (af == AF_INET) {
|
|
if (len != sizeof(struct in_addr)) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"invalid length of packed IP address string");
|
|
return NULL;
|
|
}
|
|
#ifdef ENABLE_IPV6
|
|
} else if (af == AF_INET6) {
|
|
if (len != sizeof(struct in6_addr)) {
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"invalid length of packed IP address string");
|
|
return NULL;
|
|
}
|
|
#endif
|
|
} else {
|
|
PyErr_Format(PyExc_ValueError,
|
|
"unknown address family %d", af);
|
|
return NULL;
|
|
}
|
|
|
|
retval = inet_ntop(af, packed, ip, sizeof(ip));
|
|
if (!retval) {
|
|
PyErr_SetFromErrno(socket_error);
|
|
return NULL;
|
|
} else {
|
|
return PyString_FromString(retval);
|
|
}
|
|
|
|
/* NOTREACHED */
|
|
PyErr_SetString(PyExc_RuntimeError, "invalid handling of inet_ntop");
|
|
return NULL;
|
|
}
|
|
|
|
#endif /* HAVE_INET_PTON */
|
|
|
|
/* Python interface to getaddrinfo(host, port). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_getaddrinfo(PyObject *self, PyObject *args)
|
|
{
|
|
struct addrinfo hints, *res;
|
|
struct addrinfo *res0 = NULL;
|
|
PyObject *hobj = NULL;
|
|
PyObject *pobj = (PyObject *)NULL;
|
|
char pbuf[30];
|
|
char *hptr, *pptr;
|
|
int family, socktype, protocol, flags;
|
|
int error;
|
|
PyObject *all = (PyObject *)NULL;
|
|
PyObject *single = (PyObject *)NULL;
|
|
PyObject *idna = NULL;
|
|
|
|
family = socktype = protocol = flags = 0;
|
|
family = AF_UNSPEC;
|
|
if (!PyArg_ParseTuple(args, "OO|iiii:getaddrinfo",
|
|
&hobj, &pobj, &family, &socktype,
|
|
&protocol, &flags)) {
|
|
return NULL;
|
|
}
|
|
if (hobj == Py_None) {
|
|
hptr = NULL;
|
|
} else if (PyUnicode_Check(hobj)) {
|
|
idna = PyObject_CallMethod(hobj, "encode", "s", "idna");
|
|
if (!idna)
|
|
return NULL;
|
|
hptr = PyString_AsString(idna);
|
|
} else if (PyString_Check(hobj)) {
|
|
hptr = PyString_AsString(hobj);
|
|
} else {
|
|
PyErr_SetString(PyExc_TypeError,
|
|
"getaddrinfo() argument 1 must be string or None");
|
|
return NULL;
|
|
}
|
|
if (PyInt_Check(pobj)) {
|
|
PyOS_snprintf(pbuf, sizeof(pbuf), "%ld", PyInt_AsLong(pobj));
|
|
pptr = pbuf;
|
|
} else if (PyString_Check(pobj)) {
|
|
pptr = PyString_AsString(pobj);
|
|
} else if (pobj == Py_None) {
|
|
pptr = (char *)NULL;
|
|
} else {
|
|
PyErr_SetString(socket_error, "Int or String expected");
|
|
goto err;
|
|
}
|
|
memset(&hints, 0, sizeof(hints));
|
|
hints.ai_family = family;
|
|
hints.ai_socktype = socktype;
|
|
hints.ai_protocol = protocol;
|
|
hints.ai_flags = flags;
|
|
Py_BEGIN_ALLOW_THREADS
|
|
ACQUIRE_GETADDRINFO_LOCK
|
|
error = getaddrinfo(hptr, pptr, &hints, &res0);
|
|
Py_END_ALLOW_THREADS
|
|
RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
|
|
if (error) {
|
|
set_gaierror(error);
|
|
goto err;
|
|
}
|
|
|
|
if ((all = PyList_New(0)) == NULL)
|
|
goto err;
|
|
for (res = res0; res; res = res->ai_next) {
|
|
PyObject *addr =
|
|
makesockaddr(-1, res->ai_addr, res->ai_addrlen, protocol);
|
|
if (addr == NULL)
|
|
goto err;
|
|
single = Py_BuildValue("iiisO", res->ai_family,
|
|
res->ai_socktype, res->ai_protocol,
|
|
res->ai_canonname ? res->ai_canonname : "",
|
|
addr);
|
|
Py_DECREF(addr);
|
|
if (single == NULL)
|
|
goto err;
|
|
|
|
if (PyList_Append(all, single))
|
|
goto err;
|
|
Py_XDECREF(single);
|
|
}
|
|
Py_XDECREF(idna);
|
|
if (res0)
|
|
freeaddrinfo(res0);
|
|
return all;
|
|
err:
|
|
Py_XDECREF(single);
|
|
Py_XDECREF(all);
|
|
Py_XDECREF(idna);
|
|
if (res0)
|
|
freeaddrinfo(res0);
|
|
return (PyObject *)NULL;
|
|
}
|
|
|
|
PyDoc_STRVAR(getaddrinfo_doc,
|
|
"getaddrinfo(host, port [, family, socktype, proto, flags])\n\
|
|
-> list of (family, socktype, proto, canonname, sockaddr)\n\
|
|
\n\
|
|
Resolve host and port into addrinfo struct.");
|
|
|
|
/* Python interface to getnameinfo(sa, flags). */
|
|
|
|
/*ARGSUSED*/
|
|
static PyObject *
|
|
socket_getnameinfo(PyObject *self, PyObject *args)
|
|
{
|
|
PyObject *sa = (PyObject *)NULL;
|
|
int flags;
|
|
char *hostp;
|
|
int port, flowinfo, scope_id;
|
|
char hbuf[NI_MAXHOST], pbuf[NI_MAXSERV];
|
|
struct addrinfo hints, *res = NULL;
|
|
int error;
|
|
PyObject *ret = (PyObject *)NULL;
|
|
|
|
flags = flowinfo = scope_id = 0;
|
|
if (!PyArg_ParseTuple(args, "Oi:getnameinfo", &sa, &flags))
|
|
return NULL;
|
|
if (!PyArg_ParseTuple(sa, "si|ii",
|
|
&hostp, &port, &flowinfo, &scope_id))
|
|
return NULL;
|
|
PyOS_snprintf(pbuf, sizeof(pbuf), "%d", port);
|
|
memset(&hints, 0, sizeof(hints));
|
|
hints.ai_family = AF_UNSPEC;
|
|
hints.ai_socktype = SOCK_DGRAM; /* make numeric port happy */
|
|
Py_BEGIN_ALLOW_THREADS
|
|
ACQUIRE_GETADDRINFO_LOCK
|
|
error = getaddrinfo(hostp, pbuf, &hints, &res);
|
|
Py_END_ALLOW_THREADS
|
|
RELEASE_GETADDRINFO_LOCK /* see comment in setipaddr() */
|
|
if (error) {
|
|
set_gaierror(error);
|
|
goto fail;
|
|
}
|
|
if (res->ai_next) {
|
|
PyErr_SetString(socket_error,
|
|
"sockaddr resolved to multiple addresses");
|
|
goto fail;
|
|
}
|
|
switch (res->ai_family) {
|
|
case AF_INET:
|
|
{
|
|
char *t1;
|
|
int t2;
|
|
if (PyArg_ParseTuple(sa, "si", &t1, &t2) == 0) {
|
|
PyErr_SetString(socket_error,
|
|
"IPv4 sockaddr must be 2 tuple");
|
|
goto fail;
|
|
}
|
|
break;
|
|
}
|
|
#ifdef ENABLE_IPV6
|
|
case AF_INET6:
|
|
{
|
|
struct sockaddr_in6 *sin6;
|
|
sin6 = (struct sockaddr_in6 *)res->ai_addr;
|
|
sin6->sin6_flowinfo = flowinfo;
|
|
sin6->sin6_scope_id = scope_id;
|
|
break;
|
|
}
|
|
#endif
|
|
}
|
|
error = getnameinfo(res->ai_addr, res->ai_addrlen,
|
|
hbuf, sizeof(hbuf), pbuf, sizeof(pbuf), flags);
|
|
if (error) {
|
|
set_gaierror(error);
|
|
goto fail;
|
|
}
|
|
ret = Py_BuildValue("ss", hbuf, pbuf);
|
|
|
|
fail:
|
|
if (res)
|
|
freeaddrinfo(res);
|
|
return ret;
|
|
}
|
|
|
|
PyDoc_STRVAR(getnameinfo_doc,
|
|
"getnameinfo(sockaddr, flags) --> (host, port)\n\
|
|
\n\
|
|
Get host and port for a sockaddr.");
|
|
|
|
|
|
/* Python API to getting and setting the default timeout value. */
|
|
|
|
static PyObject *
|
|
socket_getdefaulttimeout(PyObject *self)
|
|
{
|
|
if (defaulttimeout < 0.0) {
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
else
|
|
return PyFloat_FromDouble(defaulttimeout);
|
|
}
|
|
|
|
PyDoc_STRVAR(getdefaulttimeout_doc,
|
|
"getdefaulttimeout() -> timeout\n\
|
|
\n\
|
|
Returns the default timeout in floating seconds for new socket objects.\n\
|
|
A value of None indicates that new socket objects have no timeout.\n\
|
|
When the socket module is first imported, the default is None.");
|
|
|
|
static PyObject *
|
|
socket_setdefaulttimeout(PyObject *self, PyObject *arg)
|
|
{
|
|
double timeout;
|
|
|
|
if (arg == Py_None)
|
|
timeout = -1.0;
|
|
else {
|
|
timeout = PyFloat_AsDouble(arg);
|
|
if (timeout < 0.0) {
|
|
if (!PyErr_Occurred())
|
|
PyErr_SetString(PyExc_ValueError,
|
|
"Timeout value out of range");
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
defaulttimeout = timeout;
|
|
|
|
Py_INCREF(Py_None);
|
|
return Py_None;
|
|
}
|
|
|
|
PyDoc_STRVAR(setdefaulttimeout_doc,
|
|
"setdefaulttimeout(timeout)\n\
|
|
\n\
|
|
Set the default timeout in floating seconds for new socket objects.\n\
|
|
A value of None indicates that new socket objects have no timeout.\n\
|
|
When the socket module is first imported, the default is None.");
|
|
|
|
|
|
/* List of functions exported by this module. */
|
|
|
|
static PyMethodDef socket_methods[] = {
|
|
{"gethostbyname", socket_gethostbyname,
|
|
METH_VARARGS, gethostbyname_doc},
|
|
{"gethostbyname_ex", socket_gethostbyname_ex,
|
|
METH_VARARGS, ghbn_ex_doc},
|
|
{"gethostbyaddr", socket_gethostbyaddr,
|
|
METH_VARARGS, gethostbyaddr_doc},
|
|
{"gethostname", socket_gethostname,
|
|
METH_NOARGS, gethostname_doc},
|
|
{"getservbyname", socket_getservbyname,
|
|
METH_VARARGS, getservbyname_doc},
|
|
{"getservbyport", socket_getservbyport,
|
|
METH_VARARGS, getservbyport_doc},
|
|
{"getprotobyname", socket_getprotobyname,
|
|
METH_VARARGS, getprotobyname_doc},
|
|
#ifndef NO_DUP
|
|
{"fromfd", socket_fromfd,
|
|
METH_VARARGS, fromfd_doc},
|
|
#endif
|
|
#ifdef HAVE_SOCKETPAIR
|
|
{"socketpair", socket_socketpair,
|
|
METH_VARARGS, socketpair_doc},
|
|
#endif
|
|
{"ntohs", socket_ntohs,
|
|
METH_VARARGS, ntohs_doc},
|
|
{"ntohl", socket_ntohl,
|
|
METH_O, ntohl_doc},
|
|
{"htons", socket_htons,
|
|
METH_VARARGS, htons_doc},
|
|
{"htonl", socket_htonl,
|
|
METH_O, htonl_doc},
|
|
{"inet_aton", socket_inet_aton,
|
|
METH_VARARGS, inet_aton_doc},
|
|
{"inet_ntoa", socket_inet_ntoa,
|
|
METH_VARARGS, inet_ntoa_doc},
|
|
#ifdef HAVE_INET_PTON
|
|
{"inet_pton", socket_inet_pton,
|
|
METH_VARARGS, inet_pton_doc},
|
|
{"inet_ntop", socket_inet_ntop,
|
|
METH_VARARGS, inet_ntop_doc},
|
|
#endif
|
|
{"getaddrinfo", socket_getaddrinfo,
|
|
METH_VARARGS, getaddrinfo_doc},
|
|
{"getnameinfo", socket_getnameinfo,
|
|
METH_VARARGS, getnameinfo_doc},
|
|
{"getdefaulttimeout", (PyCFunction)socket_getdefaulttimeout,
|
|
METH_NOARGS, getdefaulttimeout_doc},
|
|
{"setdefaulttimeout", socket_setdefaulttimeout,
|
|
METH_O, setdefaulttimeout_doc},
|
|
{NULL, NULL} /* Sentinel */
|
|
};
|
|
|
|
|
|
#ifdef RISCOS
|
|
#define OS_INIT_DEFINED
|
|
|
|
static int
|
|
os_init(void)
|
|
{
|
|
_kernel_swi_regs r;
|
|
|
|
r.r[0] = 0;
|
|
_kernel_swi(0x43380, &r, &r);
|
|
taskwindow = r.r[0];
|
|
|
|
return 1;
|
|
}
|
|
|
|
#endif /* RISCOS */
|
|
|
|
|
|
#ifdef MS_WINDOWS
|
|
#define OS_INIT_DEFINED
|
|
|
|
/* Additional initialization and cleanup for Windows */
|
|
|
|
static void
|
|
os_cleanup(void)
|
|
{
|
|
WSACleanup();
|
|
}
|
|
|
|
static int
|
|
os_init(void)
|
|
{
|
|
WSADATA WSAData;
|
|
int ret;
|
|
char buf[100];
|
|
ret = WSAStartup(0x0101, &WSAData);
|
|
switch (ret) {
|
|
case 0: /* No error */
|
|
Py_AtExit(os_cleanup);
|
|
return 1; /* Success */
|
|
case WSASYSNOTREADY:
|
|
PyErr_SetString(PyExc_ImportError,
|
|
"WSAStartup failed: network not ready");
|
|
break;
|
|
case WSAVERNOTSUPPORTED:
|
|
case WSAEINVAL:
|
|
PyErr_SetString(
|
|
PyExc_ImportError,
|
|
"WSAStartup failed: requested version not supported");
|
|
break;
|
|
default:
|
|
PyOS_snprintf(buf, sizeof(buf),
|
|
"WSAStartup failed: error code %d", ret);
|
|
PyErr_SetString(PyExc_ImportError, buf);
|
|
break;
|
|
}
|
|
return 0; /* Failure */
|
|
}
|
|
|
|
#endif /* MS_WINDOWS */
|
|
|
|
|
|
#ifdef PYOS_OS2
|
|
#define OS_INIT_DEFINED
|
|
|
|
/* Additional initialization for OS/2 */
|
|
|
|
static int
|
|
os_init(void)
|
|
{
|
|
#ifndef PYCC_GCC
|
|
char reason[64];
|
|
int rc = sock_init();
|
|
|
|
if (rc == 0) {
|
|
return 1; /* Success */
|
|
}
|
|
|
|
PyOS_snprintf(reason, sizeof(reason),
|
|
"OS/2 TCP/IP Error# %d", sock_errno());
|
|
PyErr_SetString(PyExc_ImportError, reason);
|
|
|
|
return 0; /* Failure */
|
|
#else
|
|
/* No need to initialise sockets with GCC/EMX */
|
|
return 1; /* Success */
|
|
#endif
|
|
}
|
|
|
|
#endif /* PYOS_OS2 */
|
|
|
|
|
|
#ifndef OS_INIT_DEFINED
|
|
static int
|
|
os_init(void)
|
|
{
|
|
return 1; /* Success */
|
|
}
|
|
#endif
|
|
|
|
|
|
/* C API table - always add new things to the end for binary
|
|
compatibility. */
|
|
static
|
|
PySocketModule_APIObject PySocketModuleAPI =
|
|
{
|
|
&sock_type,
|
|
NULL
|
|
};
|
|
|
|
|
|
/* Initialize the _socket module.
|
|
|
|
This module is actually called "_socket", and there's a wrapper
|
|
"socket.py" which implements some additional functionality. On some
|
|
platforms (e.g. Windows and OS/2), socket.py also implements a
|
|
wrapper for the socket type that provides missing functionality such
|
|
as makefile(), dup() and fromfd(). The import of "_socket" may fail
|
|
with an ImportError exception if os-specific initialization fails.
|
|
On Windows, this does WINSOCK initialization. When WINSOCK is
|
|
initialized succesfully, a call to WSACleanup() is scheduled to be
|
|
made at exit time.
|
|
*/
|
|
|
|
PyDoc_STRVAR(socket_doc,
|
|
"Implementation module for socket operations.\n\
|
|
\n\
|
|
See the socket module for documentation.");
|
|
|
|
PyMODINIT_FUNC
|
|
init_socket(void)
|
|
{
|
|
PyObject *m, *has_ipv6;
|
|
|
|
if (!os_init())
|
|
return;
|
|
|
|
sock_type.ob_type = &PyType_Type;
|
|
m = Py_InitModule3(PySocket_MODULE_NAME,
|
|
socket_methods,
|
|
socket_doc);
|
|
if (m == NULL)
|
|
return;
|
|
|
|
socket_error = PyErr_NewException("socket.error", NULL, NULL);
|
|
if (socket_error == NULL)
|
|
return;
|
|
PySocketModuleAPI.error = socket_error;
|
|
Py_INCREF(socket_error);
|
|
PyModule_AddObject(m, "error", socket_error);
|
|
socket_herror = PyErr_NewException("socket.herror",
|
|
socket_error, NULL);
|
|
if (socket_herror == NULL)
|
|
return;
|
|
Py_INCREF(socket_herror);
|
|
PyModule_AddObject(m, "herror", socket_herror);
|
|
socket_gaierror = PyErr_NewException("socket.gaierror", socket_error,
|
|
NULL);
|
|
if (socket_gaierror == NULL)
|
|
return;
|
|
Py_INCREF(socket_gaierror);
|
|
PyModule_AddObject(m, "gaierror", socket_gaierror);
|
|
socket_timeout = PyErr_NewException("socket.timeout",
|
|
socket_error, NULL);
|
|
if (socket_timeout == NULL)
|
|
return;
|
|
Py_INCREF(socket_timeout);
|
|
PyModule_AddObject(m, "timeout", socket_timeout);
|
|
Py_INCREF((PyObject *)&sock_type);
|
|
if (PyModule_AddObject(m, "SocketType",
|
|
(PyObject *)&sock_type) != 0)
|
|
return;
|
|
Py_INCREF((PyObject *)&sock_type);
|
|
if (PyModule_AddObject(m, "socket",
|
|
(PyObject *)&sock_type) != 0)
|
|
return;
|
|
|
|
#ifdef ENABLE_IPV6
|
|
has_ipv6 = Py_True;
|
|
#else
|
|
has_ipv6 = Py_False;
|
|
#endif
|
|
Py_INCREF(has_ipv6);
|
|
PyModule_AddObject(m, "has_ipv6", has_ipv6);
|
|
|
|
/* Export C API */
|
|
if (PyModule_AddObject(m, PySocket_CAPI_NAME,
|
|
PyCObject_FromVoidPtr((void *)&PySocketModuleAPI, NULL)
|
|
) != 0)
|
|
return;
|
|
|
|
/* Address families (we only support AF_INET and AF_UNIX) */
|
|
#ifdef AF_UNSPEC
|
|
PyModule_AddIntConstant(m, "AF_UNSPEC", AF_UNSPEC);
|
|
#endif
|
|
PyModule_AddIntConstant(m, "AF_INET", AF_INET);
|
|
#ifdef AF_INET6
|
|
PyModule_AddIntConstant(m, "AF_INET6", AF_INET6);
|
|
#endif /* AF_INET6 */
|
|
#if defined(AF_UNIX)
|
|
PyModule_AddIntConstant(m, "AF_UNIX", AF_UNIX);
|
|
#endif /* AF_UNIX */
|
|
#ifdef AF_AX25
|
|
/* Amateur Radio AX.25 */
|
|
PyModule_AddIntConstant(m, "AF_AX25", AF_AX25);
|
|
#endif
|
|
#ifdef AF_IPX
|
|
PyModule_AddIntConstant(m, "AF_IPX", AF_IPX); /* Novell IPX */
|
|
#endif
|
|
#ifdef AF_APPLETALK
|
|
/* Appletalk DDP */
|
|
PyModule_AddIntConstant(m, "AF_APPLETALK", AF_APPLETALK);
|
|
#endif
|
|
#ifdef AF_NETROM
|
|
/* Amateur radio NetROM */
|
|
PyModule_AddIntConstant(m, "AF_NETROM", AF_NETROM);
|
|
#endif
|
|
#ifdef AF_BRIDGE
|
|
/* Multiprotocol bridge */
|
|
PyModule_AddIntConstant(m, "AF_BRIDGE", AF_BRIDGE);
|
|
#endif
|
|
#ifdef AF_ATMPVC
|
|
/* ATM PVCs */
|
|
PyModule_AddIntConstant(m, "AF_ATMPVC", AF_ATMPVC);
|
|
#endif
|
|
#ifdef AF_AAL5
|
|
/* Reserved for Werner's ATM */
|
|
PyModule_AddIntConstant(m, "AF_AAL5", AF_AAL5);
|
|
#endif
|
|
#ifdef AF_X25
|
|
/* Reserved for X.25 project */
|
|
PyModule_AddIntConstant(m, "AF_X25", AF_X25);
|
|
#endif
|
|
#ifdef AF_INET6
|
|
PyModule_AddIntConstant(m, "AF_INET6", AF_INET6); /* IP version 6 */
|
|
#endif
|
|
#ifdef AF_ROSE
|
|
/* Amateur Radio X.25 PLP */
|
|
PyModule_AddIntConstant(m, "AF_ROSE", AF_ROSE);
|
|
#endif
|
|
#ifdef AF_DECnet
|
|
/* Reserved for DECnet project */
|
|
PyModule_AddIntConstant(m, "AF_DECnet", AF_DECnet);
|
|
#endif
|
|
#ifdef AF_NETBEUI
|
|
/* Reserved for 802.2LLC project */
|
|
PyModule_AddIntConstant(m, "AF_NETBEUI", AF_NETBEUI);
|
|
#endif
|
|
#ifdef AF_SECURITY
|
|
/* Security callback pseudo AF */
|
|
PyModule_AddIntConstant(m, "AF_SECURITY", AF_SECURITY);
|
|
#endif
|
|
#ifdef AF_KEY
|
|
/* PF_KEY key management API */
|
|
PyModule_AddIntConstant(m, "AF_KEY", AF_KEY);
|
|
#endif
|
|
#ifdef AF_NETLINK
|
|
/* */
|
|
PyModule_AddIntConstant(m, "AF_NETLINK", AF_NETLINK);
|
|
PyModule_AddIntConstant(m, "NETLINK_ROUTE", NETLINK_ROUTE);
|
|
#ifdef NETLINK_SKIP
|
|
PyModule_AddIntConstant(m, "NETLINK_SKIP", NETLINK_SKIP);
|
|
#endif
|
|
#ifdef NETLINK_W1
|
|
PyModule_AddIntConstant(m, "NETLINK_W1", NETLINK_W1);
|
|
#endif
|
|
PyModule_AddIntConstant(m, "NETLINK_USERSOCK", NETLINK_USERSOCK);
|
|
PyModule_AddIntConstant(m, "NETLINK_FIREWALL", NETLINK_FIREWALL);
|
|
#ifdef NETLINK_TCPDIAG
|
|
PyModule_AddIntConstant(m, "NETLINK_TCPDIAG", NETLINK_TCPDIAG);
|
|
#endif
|
|
#ifdef NETLINK_NFLOG
|
|
PyModule_AddIntConstant(m, "NETLINK_NFLOG", NETLINK_NFLOG);
|
|
#endif
|
|
#ifdef NETLINK_XFRM
|
|
PyModule_AddIntConstant(m, "NETLINK_XFRM", NETLINK_XFRM);
|
|
#endif
|
|
#ifdef NETLINK_ARPD
|
|
PyModule_AddIntConstant(m, "NETLINK_ARPD", NETLINK_ARPD);
|
|
#endif
|
|
#ifdef NETLINK_ROUTE6
|
|
PyModule_AddIntConstant(m, "NETLINK_ROUTE6", NETLINK_ROUTE6);
|
|
#endif
|
|
PyModule_AddIntConstant(m, "NETLINK_IP6_FW", NETLINK_IP6_FW);
|
|
PyModule_AddIntConstant(m, "NETLINK_DNRTMSG", NETLINK_DNRTMSG);
|
|
#ifdef NETLINK_TAPBASE
|
|
PyModule_AddIntConstant(m, "NETLINK_TAPBASE", NETLINK_TAPBASE);
|
|
#endif
|
|
#endif /* AF_NETLINK */
|
|
#ifdef AF_ROUTE
|
|
/* Alias to emulate 4.4BSD */
|
|
PyModule_AddIntConstant(m, "AF_ROUTE", AF_ROUTE);
|
|
#endif
|
|
#ifdef AF_ASH
|
|
/* Ash */
|
|
PyModule_AddIntConstant(m, "AF_ASH", AF_ASH);
|
|
#endif
|
|
#ifdef AF_ECONET
|
|
/* Acorn Econet */
|
|
PyModule_AddIntConstant(m, "AF_ECONET", AF_ECONET);
|
|
#endif
|
|
#ifdef AF_ATMSVC
|
|
/* ATM SVCs */
|
|
PyModule_AddIntConstant(m, "AF_ATMSVC", AF_ATMSVC);
|
|
#endif
|
|
#ifdef AF_SNA
|
|
/* Linux SNA Project (nutters!) */
|
|
PyModule_AddIntConstant(m, "AF_SNA", AF_SNA);
|
|
#endif
|
|
#ifdef AF_IRDA
|
|
/* IRDA sockets */
|
|
PyModule_AddIntConstant(m, "AF_IRDA", AF_IRDA);
|
|
#endif
|
|
#ifdef AF_PPPOX
|
|
/* PPPoX sockets */
|
|
PyModule_AddIntConstant(m, "AF_PPPOX", AF_PPPOX);
|
|
#endif
|
|
#ifdef AF_WANPIPE
|
|
/* Wanpipe API Sockets */
|
|
PyModule_AddIntConstant(m, "AF_WANPIPE", AF_WANPIPE);
|
|
#endif
|
|
#ifdef AF_LLC
|
|
/* Linux LLC */
|
|
PyModule_AddIntConstant(m, "AF_LLC", AF_LLC);
|
|
#endif
|
|
|
|
#ifdef USE_BLUETOOTH
|
|
PyModule_AddIntConstant(m, "AF_BLUETOOTH", AF_BLUETOOTH);
|
|
PyModule_AddIntConstant(m, "BTPROTO_L2CAP", BTPROTO_L2CAP);
|
|
#if !defined(__FreeBSD__)
|
|
PyModule_AddIntConstant(m, "BTPROTO_SCO", BTPROTO_SCO);
|
|
#endif
|
|
PyModule_AddIntConstant(m, "BTPROTO_RFCOMM", BTPROTO_RFCOMM);
|
|
PyModule_AddStringConstant(m, "BDADDR_ANY", "00:00:00:00:00:00");
|
|
PyModule_AddStringConstant(m, "BDADDR_LOCAL", "00:00:00:FF:FF:FF");
|
|
#endif
|
|
|
|
#ifdef HAVE_NETPACKET_PACKET_H
|
|
PyModule_AddIntConstant(m, "AF_PACKET", AF_PACKET);
|
|
PyModule_AddIntConstant(m, "PF_PACKET", PF_PACKET);
|
|
PyModule_AddIntConstant(m, "PACKET_HOST", PACKET_HOST);
|
|
PyModule_AddIntConstant(m, "PACKET_BROADCAST", PACKET_BROADCAST);
|
|
PyModule_AddIntConstant(m, "PACKET_MULTICAST", PACKET_MULTICAST);
|
|
PyModule_AddIntConstant(m, "PACKET_OTHERHOST", PACKET_OTHERHOST);
|
|
PyModule_AddIntConstant(m, "PACKET_OUTGOING", PACKET_OUTGOING);
|
|
PyModule_AddIntConstant(m, "PACKET_LOOPBACK", PACKET_LOOPBACK);
|
|
PyModule_AddIntConstant(m, "PACKET_FASTROUTE", PACKET_FASTROUTE);
|
|
#endif
|
|
|
|
/* Socket types */
|
|
PyModule_AddIntConstant(m, "SOCK_STREAM", SOCK_STREAM);
|
|
PyModule_AddIntConstant(m, "SOCK_DGRAM", SOCK_DGRAM);
|
|
#ifndef __BEOS__
|
|
/* We have incomplete socket support. */
|
|
PyModule_AddIntConstant(m, "SOCK_RAW", SOCK_RAW);
|
|
PyModule_AddIntConstant(m, "SOCK_SEQPACKET", SOCK_SEQPACKET);
|
|
#if defined(SOCK_RDM)
|
|
PyModule_AddIntConstant(m, "SOCK_RDM", SOCK_RDM);
|
|
#endif
|
|
#endif
|
|
|
|
#ifdef SO_DEBUG
|
|
PyModule_AddIntConstant(m, "SO_DEBUG", SO_DEBUG);
|
|
#endif
|
|
#ifdef SO_ACCEPTCONN
|
|
PyModule_AddIntConstant(m, "SO_ACCEPTCONN", SO_ACCEPTCONN);
|
|
#endif
|
|
#ifdef SO_REUSEADDR
|
|
PyModule_AddIntConstant(m, "SO_REUSEADDR", SO_REUSEADDR);
|
|
#endif
|
|
#ifdef SO_EXCLUSIVEADDRUSE
|
|
PyModule_AddIntConstant(m, "SO_EXCLUSIVEADDRUSE", SO_EXCLUSIVEADDRUSE);
|
|
#endif
|
|
|
|
#ifdef SO_KEEPALIVE
|
|
PyModule_AddIntConstant(m, "SO_KEEPALIVE", SO_KEEPALIVE);
|
|
#endif
|
|
#ifdef SO_DONTROUTE
|
|
PyModule_AddIntConstant(m, "SO_DONTROUTE", SO_DONTROUTE);
|
|
#endif
|
|
#ifdef SO_BROADCAST
|
|
PyModule_AddIntConstant(m, "SO_BROADCAST", SO_BROADCAST);
|
|
#endif
|
|
#ifdef SO_USELOOPBACK
|
|
PyModule_AddIntConstant(m, "SO_USELOOPBACK", SO_USELOOPBACK);
|
|
#endif
|
|
#ifdef SO_LINGER
|
|
PyModule_AddIntConstant(m, "SO_LINGER", SO_LINGER);
|
|
#endif
|
|
#ifdef SO_OOBINLINE
|
|
PyModule_AddIntConstant(m, "SO_OOBINLINE", SO_OOBINLINE);
|
|
#endif
|
|
#ifdef SO_REUSEPORT
|
|
PyModule_AddIntConstant(m, "SO_REUSEPORT", SO_REUSEPORT);
|
|
#endif
|
|
#ifdef SO_SNDBUF
|
|
PyModule_AddIntConstant(m, "SO_SNDBUF", SO_SNDBUF);
|
|
#endif
|
|
#ifdef SO_RCVBUF
|
|
PyModule_AddIntConstant(m, "SO_RCVBUF", SO_RCVBUF);
|
|
#endif
|
|
#ifdef SO_SNDLOWAT
|
|
PyModule_AddIntConstant(m, "SO_SNDLOWAT", SO_SNDLOWAT);
|
|
#endif
|
|
#ifdef SO_RCVLOWAT
|
|
PyModule_AddIntConstant(m, "SO_RCVLOWAT", SO_RCVLOWAT);
|
|
#endif
|
|
#ifdef SO_SNDTIMEO
|
|
PyModule_AddIntConstant(m, "SO_SNDTIMEO", SO_SNDTIMEO);
|
|
#endif
|
|
#ifdef SO_RCVTIMEO
|
|
PyModule_AddIntConstant(m, "SO_RCVTIMEO", SO_RCVTIMEO);
|
|
#endif
|
|
#ifdef SO_ERROR
|
|
PyModule_AddIntConstant(m, "SO_ERROR", SO_ERROR);
|
|
#endif
|
|
#ifdef SO_TYPE
|
|
PyModule_AddIntConstant(m, "SO_TYPE", SO_TYPE);
|
|
#endif
|
|
|
|
/* Maximum number of connections for "listen" */
|
|
#ifdef SOMAXCONN
|
|
PyModule_AddIntConstant(m, "SOMAXCONN", SOMAXCONN);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SOMAXCONN", 5); /* Common value */
|
|
#endif
|
|
|
|
/* Flags for send, recv */
|
|
#ifdef MSG_OOB
|
|
PyModule_AddIntConstant(m, "MSG_OOB", MSG_OOB);
|
|
#endif
|
|
#ifdef MSG_PEEK
|
|
PyModule_AddIntConstant(m, "MSG_PEEK", MSG_PEEK);
|
|
#endif
|
|
#ifdef MSG_DONTROUTE
|
|
PyModule_AddIntConstant(m, "MSG_DONTROUTE", MSG_DONTROUTE);
|
|
#endif
|
|
#ifdef MSG_DONTWAIT
|
|
PyModule_AddIntConstant(m, "MSG_DONTWAIT", MSG_DONTWAIT);
|
|
#endif
|
|
#ifdef MSG_EOR
|
|
PyModule_AddIntConstant(m, "MSG_EOR", MSG_EOR);
|
|
#endif
|
|
#ifdef MSG_TRUNC
|
|
PyModule_AddIntConstant(m, "MSG_TRUNC", MSG_TRUNC);
|
|
#endif
|
|
#ifdef MSG_CTRUNC
|
|
PyModule_AddIntConstant(m, "MSG_CTRUNC", MSG_CTRUNC);
|
|
#endif
|
|
#ifdef MSG_WAITALL
|
|
PyModule_AddIntConstant(m, "MSG_WAITALL", MSG_WAITALL);
|
|
#endif
|
|
#ifdef MSG_BTAG
|
|
PyModule_AddIntConstant(m, "MSG_BTAG", MSG_BTAG);
|
|
#endif
|
|
#ifdef MSG_ETAG
|
|
PyModule_AddIntConstant(m, "MSG_ETAG", MSG_ETAG);
|
|
#endif
|
|
|
|
/* Protocol level and numbers, usable for [gs]etsockopt */
|
|
#ifdef SOL_SOCKET
|
|
PyModule_AddIntConstant(m, "SOL_SOCKET", SOL_SOCKET);
|
|
#endif
|
|
#ifdef SOL_IP
|
|
PyModule_AddIntConstant(m, "SOL_IP", SOL_IP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SOL_IP", 0);
|
|
#endif
|
|
#ifdef SOL_IPX
|
|
PyModule_AddIntConstant(m, "SOL_IPX", SOL_IPX);
|
|
#endif
|
|
#ifdef SOL_AX25
|
|
PyModule_AddIntConstant(m, "SOL_AX25", SOL_AX25);
|
|
#endif
|
|
#ifdef SOL_ATALK
|
|
PyModule_AddIntConstant(m, "SOL_ATALK", SOL_ATALK);
|
|
#endif
|
|
#ifdef SOL_NETROM
|
|
PyModule_AddIntConstant(m, "SOL_NETROM", SOL_NETROM);
|
|
#endif
|
|
#ifdef SOL_ROSE
|
|
PyModule_AddIntConstant(m, "SOL_ROSE", SOL_ROSE);
|
|
#endif
|
|
#ifdef SOL_TCP
|
|
PyModule_AddIntConstant(m, "SOL_TCP", SOL_TCP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SOL_TCP", 6);
|
|
#endif
|
|
#ifdef SOL_UDP
|
|
PyModule_AddIntConstant(m, "SOL_UDP", SOL_UDP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SOL_UDP", 17);
|
|
#endif
|
|
#ifdef IPPROTO_IP
|
|
PyModule_AddIntConstant(m, "IPPROTO_IP", IPPROTO_IP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPROTO_IP", 0);
|
|
#endif
|
|
#ifdef IPPROTO_HOPOPTS
|
|
PyModule_AddIntConstant(m, "IPPROTO_HOPOPTS", IPPROTO_HOPOPTS);
|
|
#endif
|
|
#ifdef IPPROTO_ICMP
|
|
PyModule_AddIntConstant(m, "IPPROTO_ICMP", IPPROTO_ICMP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPROTO_ICMP", 1);
|
|
#endif
|
|
#ifdef IPPROTO_IGMP
|
|
PyModule_AddIntConstant(m, "IPPROTO_IGMP", IPPROTO_IGMP);
|
|
#endif
|
|
#ifdef IPPROTO_GGP
|
|
PyModule_AddIntConstant(m, "IPPROTO_GGP", IPPROTO_GGP);
|
|
#endif
|
|
#ifdef IPPROTO_IPV4
|
|
PyModule_AddIntConstant(m, "IPPROTO_IPV4", IPPROTO_IPV4);
|
|
#endif
|
|
#ifdef IPPROTO_IPV6
|
|
PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6);
|
|
#endif
|
|
#ifdef IPPROTO_IPIP
|
|
PyModule_AddIntConstant(m, "IPPROTO_IPIP", IPPROTO_IPIP);
|
|
#endif
|
|
#ifdef IPPROTO_TCP
|
|
PyModule_AddIntConstant(m, "IPPROTO_TCP", IPPROTO_TCP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPROTO_TCP", 6);
|
|
#endif
|
|
#ifdef IPPROTO_EGP
|
|
PyModule_AddIntConstant(m, "IPPROTO_EGP", IPPROTO_EGP);
|
|
#endif
|
|
#ifdef IPPROTO_PUP
|
|
PyModule_AddIntConstant(m, "IPPROTO_PUP", IPPROTO_PUP);
|
|
#endif
|
|
#ifdef IPPROTO_UDP
|
|
PyModule_AddIntConstant(m, "IPPROTO_UDP", IPPROTO_UDP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPROTO_UDP", 17);
|
|
#endif
|
|
#ifdef IPPROTO_IDP
|
|
PyModule_AddIntConstant(m, "IPPROTO_IDP", IPPROTO_IDP);
|
|
#endif
|
|
#ifdef IPPROTO_HELLO
|
|
PyModule_AddIntConstant(m, "IPPROTO_HELLO", IPPROTO_HELLO);
|
|
#endif
|
|
#ifdef IPPROTO_ND
|
|
PyModule_AddIntConstant(m, "IPPROTO_ND", IPPROTO_ND);
|
|
#endif
|
|
#ifdef IPPROTO_TP
|
|
PyModule_AddIntConstant(m, "IPPROTO_TP", IPPROTO_TP);
|
|
#endif
|
|
#ifdef IPPROTO_IPV6
|
|
PyModule_AddIntConstant(m, "IPPROTO_IPV6", IPPROTO_IPV6);
|
|
#endif
|
|
#ifdef IPPROTO_ROUTING
|
|
PyModule_AddIntConstant(m, "IPPROTO_ROUTING", IPPROTO_ROUTING);
|
|
#endif
|
|
#ifdef IPPROTO_FRAGMENT
|
|
PyModule_AddIntConstant(m, "IPPROTO_FRAGMENT", IPPROTO_FRAGMENT);
|
|
#endif
|
|
#ifdef IPPROTO_RSVP
|
|
PyModule_AddIntConstant(m, "IPPROTO_RSVP", IPPROTO_RSVP);
|
|
#endif
|
|
#ifdef IPPROTO_GRE
|
|
PyModule_AddIntConstant(m, "IPPROTO_GRE", IPPROTO_GRE);
|
|
#endif
|
|
#ifdef IPPROTO_ESP
|
|
PyModule_AddIntConstant(m, "IPPROTO_ESP", IPPROTO_ESP);
|
|
#endif
|
|
#ifdef IPPROTO_AH
|
|
PyModule_AddIntConstant(m, "IPPROTO_AH", IPPROTO_AH);
|
|
#endif
|
|
#ifdef IPPROTO_MOBILE
|
|
PyModule_AddIntConstant(m, "IPPROTO_MOBILE", IPPROTO_MOBILE);
|
|
#endif
|
|
#ifdef IPPROTO_ICMPV6
|
|
PyModule_AddIntConstant(m, "IPPROTO_ICMPV6", IPPROTO_ICMPV6);
|
|
#endif
|
|
#ifdef IPPROTO_NONE
|
|
PyModule_AddIntConstant(m, "IPPROTO_NONE", IPPROTO_NONE);
|
|
#endif
|
|
#ifdef IPPROTO_DSTOPTS
|
|
PyModule_AddIntConstant(m, "IPPROTO_DSTOPTS", IPPROTO_DSTOPTS);
|
|
#endif
|
|
#ifdef IPPROTO_XTP
|
|
PyModule_AddIntConstant(m, "IPPROTO_XTP", IPPROTO_XTP);
|
|
#endif
|
|
#ifdef IPPROTO_EON
|
|
PyModule_AddIntConstant(m, "IPPROTO_EON", IPPROTO_EON);
|
|
#endif
|
|
#ifdef IPPROTO_PIM
|
|
PyModule_AddIntConstant(m, "IPPROTO_PIM", IPPROTO_PIM);
|
|
#endif
|
|
#ifdef IPPROTO_IPCOMP
|
|
PyModule_AddIntConstant(m, "IPPROTO_IPCOMP", IPPROTO_IPCOMP);
|
|
#endif
|
|
#ifdef IPPROTO_VRRP
|
|
PyModule_AddIntConstant(m, "IPPROTO_VRRP", IPPROTO_VRRP);
|
|
#endif
|
|
#ifdef IPPROTO_BIP
|
|
PyModule_AddIntConstant(m, "IPPROTO_BIP", IPPROTO_BIP);
|
|
#endif
|
|
/**/
|
|
#ifdef IPPROTO_RAW
|
|
PyModule_AddIntConstant(m, "IPPROTO_RAW", IPPROTO_RAW);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPROTO_RAW", 255);
|
|
#endif
|
|
#ifdef IPPROTO_MAX
|
|
PyModule_AddIntConstant(m, "IPPROTO_MAX", IPPROTO_MAX);
|
|
#endif
|
|
|
|
/* Some port configuration */
|
|
#ifdef IPPORT_RESERVED
|
|
PyModule_AddIntConstant(m, "IPPORT_RESERVED", IPPORT_RESERVED);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPORT_RESERVED", 1024);
|
|
#endif
|
|
#ifdef IPPORT_USERRESERVED
|
|
PyModule_AddIntConstant(m, "IPPORT_USERRESERVED", IPPORT_USERRESERVED);
|
|
#else
|
|
PyModule_AddIntConstant(m, "IPPORT_USERRESERVED", 5000);
|
|
#endif
|
|
|
|
/* Some reserved IP v.4 addresses */
|
|
#ifdef INADDR_ANY
|
|
PyModule_AddIntConstant(m, "INADDR_ANY", INADDR_ANY);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_ANY", 0x00000000);
|
|
#endif
|
|
#ifdef INADDR_BROADCAST
|
|
PyModule_AddIntConstant(m, "INADDR_BROADCAST", INADDR_BROADCAST);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_BROADCAST", 0xffffffff);
|
|
#endif
|
|
#ifdef INADDR_LOOPBACK
|
|
PyModule_AddIntConstant(m, "INADDR_LOOPBACK", INADDR_LOOPBACK);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_LOOPBACK", 0x7F000001);
|
|
#endif
|
|
#ifdef INADDR_UNSPEC_GROUP
|
|
PyModule_AddIntConstant(m, "INADDR_UNSPEC_GROUP", INADDR_UNSPEC_GROUP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_UNSPEC_GROUP", 0xe0000000);
|
|
#endif
|
|
#ifdef INADDR_ALLHOSTS_GROUP
|
|
PyModule_AddIntConstant(m, "INADDR_ALLHOSTS_GROUP",
|
|
INADDR_ALLHOSTS_GROUP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_ALLHOSTS_GROUP", 0xe0000001);
|
|
#endif
|
|
#ifdef INADDR_MAX_LOCAL_GROUP
|
|
PyModule_AddIntConstant(m, "INADDR_MAX_LOCAL_GROUP",
|
|
INADDR_MAX_LOCAL_GROUP);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_MAX_LOCAL_GROUP", 0xe00000ff);
|
|
#endif
|
|
#ifdef INADDR_NONE
|
|
PyModule_AddIntConstant(m, "INADDR_NONE", INADDR_NONE);
|
|
#else
|
|
PyModule_AddIntConstant(m, "INADDR_NONE", 0xffffffff);
|
|
#endif
|
|
|
|
/* IPv4 [gs]etsockopt options */
|
|
#ifdef IP_OPTIONS
|
|
PyModule_AddIntConstant(m, "IP_OPTIONS", IP_OPTIONS);
|
|
#endif
|
|
#ifdef IP_HDRINCL
|
|
PyModule_AddIntConstant(m, "IP_HDRINCL", IP_HDRINCL);
|
|
#endif
|
|
#ifdef IP_TOS
|
|
PyModule_AddIntConstant(m, "IP_TOS", IP_TOS);
|
|
#endif
|
|
#ifdef IP_TTL
|
|
PyModule_AddIntConstant(m, "IP_TTL", IP_TTL);
|
|
#endif
|
|
#ifdef IP_RECVOPTS
|
|
PyModule_AddIntConstant(m, "IP_RECVOPTS", IP_RECVOPTS);
|
|
#endif
|
|
#ifdef IP_RECVRETOPTS
|
|
PyModule_AddIntConstant(m, "IP_RECVRETOPTS", IP_RECVRETOPTS);
|
|
#endif
|
|
#ifdef IP_RECVDSTADDR
|
|
PyModule_AddIntConstant(m, "IP_RECVDSTADDR", IP_RECVDSTADDR);
|
|
#endif
|
|
#ifdef IP_RETOPTS
|
|
PyModule_AddIntConstant(m, "IP_RETOPTS", IP_RETOPTS);
|
|
#endif
|
|
#ifdef IP_MULTICAST_IF
|
|
PyModule_AddIntConstant(m, "IP_MULTICAST_IF", IP_MULTICAST_IF);
|
|
#endif
|
|
#ifdef IP_MULTICAST_TTL
|
|
PyModule_AddIntConstant(m, "IP_MULTICAST_TTL", IP_MULTICAST_TTL);
|
|
#endif
|
|
#ifdef IP_MULTICAST_LOOP
|
|
PyModule_AddIntConstant(m, "IP_MULTICAST_LOOP", IP_MULTICAST_LOOP);
|
|
#endif
|
|
#ifdef IP_ADD_MEMBERSHIP
|
|
PyModule_AddIntConstant(m, "IP_ADD_MEMBERSHIP", IP_ADD_MEMBERSHIP);
|
|
#endif
|
|
#ifdef IP_DROP_MEMBERSHIP
|
|
PyModule_AddIntConstant(m, "IP_DROP_MEMBERSHIP", IP_DROP_MEMBERSHIP);
|
|
#endif
|
|
#ifdef IP_DEFAULT_MULTICAST_TTL
|
|
PyModule_AddIntConstant(m, "IP_DEFAULT_MULTICAST_TTL",
|
|
IP_DEFAULT_MULTICAST_TTL);
|
|
#endif
|
|
#ifdef IP_DEFAULT_MULTICAST_LOOP
|
|
PyModule_AddIntConstant(m, "IP_DEFAULT_MULTICAST_LOOP",
|
|
IP_DEFAULT_MULTICAST_LOOP);
|
|
#endif
|
|
#ifdef IP_MAX_MEMBERSHIPS
|
|
PyModule_AddIntConstant(m, "IP_MAX_MEMBERSHIPS", IP_MAX_MEMBERSHIPS);
|
|
#endif
|
|
|
|
/* IPv6 [gs]etsockopt options, defined in RFC2553 */
|
|
#ifdef IPV6_JOIN_GROUP
|
|
PyModule_AddIntConstant(m, "IPV6_JOIN_GROUP", IPV6_JOIN_GROUP);
|
|
#endif
|
|
#ifdef IPV6_LEAVE_GROUP
|
|
PyModule_AddIntConstant(m, "IPV6_LEAVE_GROUP", IPV6_LEAVE_GROUP);
|
|
#endif
|
|
#ifdef IPV6_MULTICAST_HOPS
|
|
PyModule_AddIntConstant(m, "IPV6_MULTICAST_HOPS", IPV6_MULTICAST_HOPS);
|
|
#endif
|
|
#ifdef IPV6_MULTICAST_IF
|
|
PyModule_AddIntConstant(m, "IPV6_MULTICAST_IF", IPV6_MULTICAST_IF);
|
|
#endif
|
|
#ifdef IPV6_MULTICAST_LOOP
|
|
PyModule_AddIntConstant(m, "IPV6_MULTICAST_LOOP", IPV6_MULTICAST_LOOP);
|
|
#endif
|
|
#ifdef IPV6_UNICAST_HOPS
|
|
PyModule_AddIntConstant(m, "IPV6_UNICAST_HOPS", IPV6_UNICAST_HOPS);
|
|
#endif
|
|
/* Additional IPV6 socket options, defined in RFC 3493 */
|
|
#ifdef IPV6_V6ONLY
|
|
PyModule_AddIntConstant(m, "IPV6_V6ONLY", IPV6_V6ONLY);
|
|
#endif
|
|
/* Advanced IPV6 socket options, from RFC 3542 */
|
|
#ifdef IPV6_CHECKSUM
|
|
PyModule_AddIntConstant(m, "IPV6_CHECKSUM", IPV6_CHECKSUM);
|
|
#endif
|
|
#ifdef IPV6_DONTFRAG
|
|
PyModule_AddIntConstant(m, "IPV6_DONTFRAG", IPV6_DONTFRAG);
|
|
#endif
|
|
#ifdef IPV6_DSTOPTS
|
|
PyModule_AddIntConstant(m, "IPV6_DSTOPTS", IPV6_DSTOPTS);
|
|
#endif
|
|
#ifdef IPV6_HOPLIMIT
|
|
PyModule_AddIntConstant(m, "IPV6_HOPLIMIT", IPV6_HOPLIMIT);
|
|
#endif
|
|
#ifdef IPV6_HOPOPTS
|
|
PyModule_AddIntConstant(m, "IPV6_HOPOPTS", IPV6_HOPOPTS);
|
|
#endif
|
|
#ifdef IPV6_NEXTHOP
|
|
PyModule_AddIntConstant(m, "IPV6_NEXTHOP", IPV6_NEXTHOP);
|
|
#endif
|
|
#ifdef IPV6_PATHMTU
|
|
PyModule_AddIntConstant(m, "IPV6_PATHMTU", IPV6_PATHMTU);
|
|
#endif
|
|
#ifdef IPV6_PKTINFO
|
|
PyModule_AddIntConstant(m, "IPV6_PKTINFO", IPV6_PKTINFO);
|
|
#endif
|
|
#ifdef IPV6_RECVDSTOPTS
|
|
PyModule_AddIntConstant(m, "IPV6_RECVDSTOPTS", IPV6_RECVDSTOPTS);
|
|
#endif
|
|
#ifdef IPV6_RECVHOPLIMIT
|
|
PyModule_AddIntConstant(m, "IPV6_RECVHOPLIMIT", IPV6_RECVHOPLIMIT);
|
|
#endif
|
|
#ifdef IPV6_RECVHOPOPTS
|
|
PyModule_AddIntConstant(m, "IPV6_RECVHOPOPTS", IPV6_RECVHOPOPTS);
|
|
#endif
|
|
#ifdef IPV6_RECVPKTINFO
|
|
PyModule_AddIntConstant(m, "IPV6_RECVPKTINFO", IPV6_RECVPKTINFO);
|
|
#endif
|
|
#ifdef IPV6_RECVRTHDR
|
|
PyModule_AddIntConstant(m, "IPV6_RECVRTHDR", IPV6_RECVRTHDR);
|
|
#endif
|
|
#ifdef IPV6_RECVTCLASS
|
|
PyModule_AddIntConstant(m, "IPV6_RECVTCLASS", IPV6_RECVTCLASS);
|
|
#endif
|
|
#ifdef IPV6_RTHDR
|
|
PyModule_AddIntConstant(m, "IPV6_RTHDR", IPV6_RTHDR);
|
|
#endif
|
|
#ifdef IPV6_RTHDRDSTOPTS
|
|
PyModule_AddIntConstant(m, "IPV6_RTHDRDSTOPTS", IPV6_RTHDRDSTOPTS);
|
|
#endif
|
|
#ifdef IPV6_RTHDR_TYPE_0
|
|
PyModule_AddIntConstant(m, "IPV6_RTHDR_TYPE_0", IPV6_RTHDR_TYPE_0);
|
|
#endif
|
|
#ifdef IPV6_RECVPATHMTU
|
|
PyModule_AddIntConstant(m, "IPV6_RECVPATHMTU", IPV6_RECVPATHMTU);
|
|
#endif
|
|
#ifdef IPV6_TCLASS
|
|
PyModule_AddIntConstant(m, "IPV6_TCLASS", IPV6_TCLASS);
|
|
#endif
|
|
#ifdef IPV6_USE_MIN_MTU
|
|
PyModule_AddIntConstant(m, "IPV6_USE_MIN_MTU", IPV6_USE_MIN_MTU);
|
|
#endif
|
|
|
|
/* TCP options */
|
|
#ifdef TCP_NODELAY
|
|
PyModule_AddIntConstant(m, "TCP_NODELAY", TCP_NODELAY);
|
|
#endif
|
|
#ifdef TCP_MAXSEG
|
|
PyModule_AddIntConstant(m, "TCP_MAXSEG", TCP_MAXSEG);
|
|
#endif
|
|
#ifdef TCP_CORK
|
|
PyModule_AddIntConstant(m, "TCP_CORK", TCP_CORK);
|
|
#endif
|
|
#ifdef TCP_KEEPIDLE
|
|
PyModule_AddIntConstant(m, "TCP_KEEPIDLE", TCP_KEEPIDLE);
|
|
#endif
|
|
#ifdef TCP_KEEPINTVL
|
|
PyModule_AddIntConstant(m, "TCP_KEEPINTVL", TCP_KEEPINTVL);
|
|
#endif
|
|
#ifdef TCP_KEEPCNT
|
|
PyModule_AddIntConstant(m, "TCP_KEEPCNT", TCP_KEEPCNT);
|
|
#endif
|
|
#ifdef TCP_SYNCNT
|
|
PyModule_AddIntConstant(m, "TCP_SYNCNT", TCP_SYNCNT);
|
|
#endif
|
|
#ifdef TCP_LINGER2
|
|
PyModule_AddIntConstant(m, "TCP_LINGER2", TCP_LINGER2);
|
|
#endif
|
|
#ifdef TCP_DEFER_ACCEPT
|
|
PyModule_AddIntConstant(m, "TCP_DEFER_ACCEPT", TCP_DEFER_ACCEPT);
|
|
#endif
|
|
#ifdef TCP_WINDOW_CLAMP
|
|
PyModule_AddIntConstant(m, "TCP_WINDOW_CLAMP", TCP_WINDOW_CLAMP);
|
|
#endif
|
|
#ifdef TCP_INFO
|
|
PyModule_AddIntConstant(m, "TCP_INFO", TCP_INFO);
|
|
#endif
|
|
#ifdef TCP_QUICKACK
|
|
PyModule_AddIntConstant(m, "TCP_QUICKACK", TCP_QUICKACK);
|
|
#endif
|
|
|
|
|
|
/* IPX options */
|
|
#ifdef IPX_TYPE
|
|
PyModule_AddIntConstant(m, "IPX_TYPE", IPX_TYPE);
|
|
#endif
|
|
|
|
/* get{addr,name}info parameters */
|
|
#ifdef EAI_ADDRFAMILY
|
|
PyModule_AddIntConstant(m, "EAI_ADDRFAMILY", EAI_ADDRFAMILY);
|
|
#endif
|
|
#ifdef EAI_AGAIN
|
|
PyModule_AddIntConstant(m, "EAI_AGAIN", EAI_AGAIN);
|
|
#endif
|
|
#ifdef EAI_BADFLAGS
|
|
PyModule_AddIntConstant(m, "EAI_BADFLAGS", EAI_BADFLAGS);
|
|
#endif
|
|
#ifdef EAI_FAIL
|
|
PyModule_AddIntConstant(m, "EAI_FAIL", EAI_FAIL);
|
|
#endif
|
|
#ifdef EAI_FAMILY
|
|
PyModule_AddIntConstant(m, "EAI_FAMILY", EAI_FAMILY);
|
|
#endif
|
|
#ifdef EAI_MEMORY
|
|
PyModule_AddIntConstant(m, "EAI_MEMORY", EAI_MEMORY);
|
|
#endif
|
|
#ifdef EAI_NODATA
|
|
PyModule_AddIntConstant(m, "EAI_NODATA", EAI_NODATA);
|
|
#endif
|
|
#ifdef EAI_NONAME
|
|
PyModule_AddIntConstant(m, "EAI_NONAME", EAI_NONAME);
|
|
#endif
|
|
#ifdef EAI_OVERFLOW
|
|
PyModule_AddIntConstant(m, "EAI_OVERFLOW", EAI_OVERFLOW);
|
|
#endif
|
|
#ifdef EAI_SERVICE
|
|
PyModule_AddIntConstant(m, "EAI_SERVICE", EAI_SERVICE);
|
|
#endif
|
|
#ifdef EAI_SOCKTYPE
|
|
PyModule_AddIntConstant(m, "EAI_SOCKTYPE", EAI_SOCKTYPE);
|
|
#endif
|
|
#ifdef EAI_SYSTEM
|
|
PyModule_AddIntConstant(m, "EAI_SYSTEM", EAI_SYSTEM);
|
|
#endif
|
|
#ifdef EAI_BADHINTS
|
|
PyModule_AddIntConstant(m, "EAI_BADHINTS", EAI_BADHINTS);
|
|
#endif
|
|
#ifdef EAI_PROTOCOL
|
|
PyModule_AddIntConstant(m, "EAI_PROTOCOL", EAI_PROTOCOL);
|
|
#endif
|
|
#ifdef EAI_MAX
|
|
PyModule_AddIntConstant(m, "EAI_MAX", EAI_MAX);
|
|
#endif
|
|
#ifdef AI_PASSIVE
|
|
PyModule_AddIntConstant(m, "AI_PASSIVE", AI_PASSIVE);
|
|
#endif
|
|
#ifdef AI_CANONNAME
|
|
PyModule_AddIntConstant(m, "AI_CANONNAME", AI_CANONNAME);
|
|
#endif
|
|
#ifdef AI_NUMERICHOST
|
|
PyModule_AddIntConstant(m, "AI_NUMERICHOST", AI_NUMERICHOST);
|
|
#endif
|
|
#ifdef AI_NUMERICSERV
|
|
PyModule_AddIntConstant(m, "AI_NUMERICSERV", AI_NUMERICSERV);
|
|
#endif
|
|
#ifdef AI_MASK
|
|
PyModule_AddIntConstant(m, "AI_MASK", AI_MASK);
|
|
#endif
|
|
#ifdef AI_ALL
|
|
PyModule_AddIntConstant(m, "AI_ALL", AI_ALL);
|
|
#endif
|
|
#ifdef AI_V4MAPPED_CFG
|
|
PyModule_AddIntConstant(m, "AI_V4MAPPED_CFG", AI_V4MAPPED_CFG);
|
|
#endif
|
|
#ifdef AI_ADDRCONFIG
|
|
PyModule_AddIntConstant(m, "AI_ADDRCONFIG", AI_ADDRCONFIG);
|
|
#endif
|
|
#ifdef AI_V4MAPPED
|
|
PyModule_AddIntConstant(m, "AI_V4MAPPED", AI_V4MAPPED);
|
|
#endif
|
|
#ifdef AI_DEFAULT
|
|
PyModule_AddIntConstant(m, "AI_DEFAULT", AI_DEFAULT);
|
|
#endif
|
|
#ifdef NI_MAXHOST
|
|
PyModule_AddIntConstant(m, "NI_MAXHOST", NI_MAXHOST);
|
|
#endif
|
|
#ifdef NI_MAXSERV
|
|
PyModule_AddIntConstant(m, "NI_MAXSERV", NI_MAXSERV);
|
|
#endif
|
|
#ifdef NI_NOFQDN
|
|
PyModule_AddIntConstant(m, "NI_NOFQDN", NI_NOFQDN);
|
|
#endif
|
|
#ifdef NI_NUMERICHOST
|
|
PyModule_AddIntConstant(m, "NI_NUMERICHOST", NI_NUMERICHOST);
|
|
#endif
|
|
#ifdef NI_NAMEREQD
|
|
PyModule_AddIntConstant(m, "NI_NAMEREQD", NI_NAMEREQD);
|
|
#endif
|
|
#ifdef NI_NUMERICSERV
|
|
PyModule_AddIntConstant(m, "NI_NUMERICSERV", NI_NUMERICSERV);
|
|
#endif
|
|
#ifdef NI_DGRAM
|
|
PyModule_AddIntConstant(m, "NI_DGRAM", NI_DGRAM);
|
|
#endif
|
|
|
|
/* shutdown() parameters */
|
|
#ifdef SHUT_RD
|
|
PyModule_AddIntConstant(m, "SHUT_RD", SHUT_RD);
|
|
#elif defined(SD_RECEIVE)
|
|
PyModule_AddIntConstant(m, "SHUT_RD", SD_RECEIVE);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SHUT_RD", 0);
|
|
#endif
|
|
#ifdef SHUT_WR
|
|
PyModule_AddIntConstant(m, "SHUT_WR", SHUT_WR);
|
|
#elif defined(SD_SEND)
|
|
PyModule_AddIntConstant(m, "SHUT_WR", SD_SEND);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SHUT_WR", 1);
|
|
#endif
|
|
#ifdef SHUT_RDWR
|
|
PyModule_AddIntConstant(m, "SHUT_RDWR", SHUT_RDWR);
|
|
#elif defined(SD_BOTH)
|
|
PyModule_AddIntConstant(m, "SHUT_RDWR", SD_BOTH);
|
|
#else
|
|
PyModule_AddIntConstant(m, "SHUT_RDWR", 2);
|
|
#endif
|
|
|
|
/* Initialize gethostbyname lock */
|
|
#if defined(USE_GETHOSTBYNAME_LOCK) || defined(USE_GETADDRINFO_LOCK)
|
|
netdb_lock = PyThread_allocate_lock();
|
|
#endif
|
|
}
|
|
|
|
|
|
#ifndef HAVE_INET_PTON
|
|
|
|
/* Simplistic emulation code for inet_pton that only works for IPv4 */
|
|
/* These are not exposed because they do not set errno properly */
|
|
|
|
int
|
|
inet_pton(int af, const char *src, void *dst)
|
|
{
|
|
if (af == AF_INET) {
|
|
long packed_addr;
|
|
packed_addr = inet_addr(src);
|
|
if (packed_addr == INADDR_NONE)
|
|
return 0;
|
|
memcpy(dst, &packed_addr, 4);
|
|
return 1;
|
|
}
|
|
/* Should set errno to EAFNOSUPPORT */
|
|
return -1;
|
|
}
|
|
|
|
const char *
|
|
inet_ntop(int af, const void *src, char *dst, socklen_t size)
|
|
{
|
|
if (af == AF_INET) {
|
|
struct in_addr packed_addr;
|
|
if (size < 16)
|
|
/* Should set errno to ENOSPC. */
|
|
return NULL;
|
|
memcpy(&packed_addr, src, sizeof(packed_addr));
|
|
return strncpy(dst, inet_ntoa(packed_addr), size);
|
|
}
|
|
/* Should set errno to EAFNOSUPPORT */
|
|
return NULL;
|
|
}
|
|
|
|
#endif
|