mirror of
https://github.com/python/cpython.git
synced 2024-11-25 02:44:06 +08:00
89f507fe8c
Merged revisions 51434-53004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r51434 | neal.norwitz | 2006-08-21 20:20:10 +0200 (Mon, 21 Aug 2006) | 1 line Fix a couple of ssize-t issues reported by Alexander Belopolsky on python-dev ........ r51439 | neal.norwitz | 2006-08-21 21:47:08 +0200 (Mon, 21 Aug 2006) | 6 lines Patch #1542451: disallow continue anywhere under a finally I'm undecided if this should be backported to 2.5 or 2.5.1. Armin suggested to wait (I'm of the same opinion). Thomas W thinks it's fine to go in 2.5. ........ r51443 | neal.norwitz | 2006-08-21 22:16:24 +0200 (Mon, 21 Aug 2006) | 4 lines Handle a few more error conditions. Klocwork 301 and 302. Will backport. ........ r51450 | neal.norwitz | 2006-08-22 00:21:19 +0200 (Tue, 22 Aug 2006) | 5 lines Patch #1541585: fix buffer overrun when performing repr() on a unicode string in a build with wide unicode (UCS-4) support. This code could be improved, so add an XXX comment. ........ r51456 | neal.norwitz | 2006-08-22 01:44:48 +0200 (Tue, 22 Aug 2006) | 1 line Try to get the windows bots working again with the new peephole.c ........ r51461 | anthony.baxter | 2006-08-22 09:36:59 +0200 (Tue, 22 Aug 2006) | 1 line patch for documentation for recent uuid changes (from ping) ........ r51473 | neal.norwitz | 2006-08-22 15:56:56 +0200 (Tue, 22 Aug 2006) | 1 line Alexander Belopolsky pointed out that pos is a size_t ........ r51489 | jeremy.hylton | 2006-08-22 22:46:00 +0200 (Tue, 22 Aug 2006) | 2 lines Expose column offset information in parse trees. ........ r51497 | andrew.kuchling | 2006-08-23 01:13:43 +0200 (Wed, 23 Aug 2006) | 1 line Move functional howto into trunk ........ r51515 | jeremy.hylton | 2006-08-23 20:37:43 +0200 (Wed, 23 Aug 2006) | 2 lines Baby steps towards better tests for tokenize ........ r51525 | alex.martelli | 2006-08-23 22:42:02 +0200 (Wed, 23 Aug 2006) | 6 lines x**2 should about equal x*x (including for a float x such that the result is inf) but didn't; added a test to test_float to verify that, and ignored the ERANGE value for errno in the pow operation to make the new test pass (with help from Marilyn Davis at the Google Python Sprint -- thanks!). ........ r51526 | jeremy.hylton | 2006-08-23 23:14:03 +0200 (Wed, 23 Aug 2006) | 20 lines Bug fixes large and small for tokenize. Small: Always generate a NL or NEWLINE token following a COMMENT token. The old code did not generate an NL token if the comment was on a line by itself. Large: The output of untokenize() will now match the input exactly if it is passed the full token sequence. The old, crufty output is still generated if a limited input sequence is provided, where limited means that it does not include position information for tokens. Remaining bug: There is no CONTINUATION token (\) so there is no way for untokenize() to handle such code. Also, expanded the number of doctests in hopes of eventually removing the old-style tests that compare against a golden file. Bug fix candidate for Python 2.5.1. (Sigh.) ........ r51527 | jeremy.hylton | 2006-08-23 23:26:46 +0200 (Wed, 23 Aug 2006) | 5 lines Replace dead code with an assert. Now that COMMENT tokens are reliably followed by NL or NEWLINE, there is never a need to add extra newlines in untokenize. ........ r51530 | alex.martelli | 2006-08-24 00:17:59 +0200 (Thu, 24 Aug 2006) | 7 lines Reverting the patch that tried to fix the issue whereby x**2 raises OverflowError while x*x succeeds and produces infinity; apparently these inconsistencies cannot be fixed across ``all'' platforms and there's a widespread feeling that therefore ``every'' platform should keep suffering forevermore. Ah well. ........ r51565 | thomas.wouters | 2006-08-24 20:40:20 +0200 (Thu, 24 Aug 2006) | 6 lines Fix SF bug #1545837: array.array borks on deepcopy. array.__deepcopy__() needs to take an argument, even if it doesn't actually use it. Will backport to 2.5 and 2.4 (if applicable.) ........ r51580 | martin.v.loewis | 2006-08-25 02:03:34 +0200 (Fri, 25 Aug 2006) | 3 lines Patch #1545507: Exclude ctypes package in Win64 MSI file. Will backport to 2.5. ........ r51589 | neal.norwitz | 2006-08-25 03:52:49 +0200 (Fri, 25 Aug 2006) | 1 line importing types is not necessary if we use isinstance ........ r51604 | thomas.heller | 2006-08-25 09:27:33 +0200 (Fri, 25 Aug 2006) | 3 lines Port _ctypes.pyd to win64 on AMD64. ........ r51605 | thomas.heller | 2006-08-25 09:34:51 +0200 (Fri, 25 Aug 2006) | 3 lines Add missing file for _ctypes.pyd port to win64 on AMD64. ........ r51606 | thomas.heller | 2006-08-25 11:26:33 +0200 (Fri, 25 Aug 2006) | 6 lines Build _ctypes.pyd for win AMD64 into the MSVC project file. Since MSVC doesn't know about .asm files, a helper batch file is needed to find ml64.exe in predefined locations. The helper script hardcodes the path to the MS Platform SDK. ........ r51608 | armin.rigo | 2006-08-25 14:44:28 +0200 (Fri, 25 Aug 2006) | 4 lines The regular expression engine in '_sre' can segfault when interpreting bogus bytecode. It is unclear whether this is a real bug or a "won't fix" case like bogus_code_obj.py. ........ r51617 | tim.peters | 2006-08-26 00:05:39 +0200 (Sat, 26 Aug 2006) | 2 lines Whitespace normalization. ........ r51618 | tim.peters | 2006-08-26 00:06:44 +0200 (Sat, 26 Aug 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51619 | tim.peters | 2006-08-26 00:26:21 +0200 (Sat, 26 Aug 2006) | 3 lines A new test here relied on preserving invisible trailing whitespace in expected output. Stop that. ........ r51624 | jack.diederich | 2006-08-26 20:42:06 +0200 (Sat, 26 Aug 2006) | 4 lines - Move functions common to all path modules into genericpath.py and have the OS speicifc path modules import them. - Have os2emxpath import common functions fron ntpath instead of using copies ........ r51642 | neal.norwitz | 2006-08-29 07:40:58 +0200 (Tue, 29 Aug 2006) | 1 line Fix a couple of typos. ........ r51647 | marc-andre.lemburg | 2006-08-29 12:34:12 +0200 (Tue, 29 Aug 2006) | 5 lines Fix a buglet in the error reporting (SF bug report #1546372). This should probably go into Python 2.5 or 2.5.1 as well. ........ r51663 | armin.rigo | 2006-08-31 10:51:06 +0200 (Thu, 31 Aug 2006) | 3 lines Doc fix: hashlib objects don't always return a digest of 16 bytes. Backport candidate for 2.5. ........ r51664 | nick.coghlan | 2006-08-31 14:00:43 +0200 (Thu, 31 Aug 2006) | 1 line Fix the wrongheaded implementation of context management in the decimal module and add unit tests. (python-dev discussion is ongoing regarding what we do about Python 2.5) ........ r51665 | nick.coghlan | 2006-08-31 14:51:25 +0200 (Thu, 31 Aug 2006) | 1 line Remove the old decimal context management tests from test_contextlib (guess who didn't run the test suite before committing...) ........ r51669 | brett.cannon | 2006-08-31 20:54:26 +0200 (Thu, 31 Aug 2006) | 4 lines Make sure memory is properly cleaned up in file_init. Backport candidate. ........ r51671 | brett.cannon | 2006-08-31 23:47:52 +0200 (Thu, 31 Aug 2006) | 2 lines Fix comment about indentation level in C files. ........ r51674 | brett.cannon | 2006-09-01 00:42:37 +0200 (Fri, 01 Sep 2006) | 3 lines Have pre-existing C files use 8 spaces indents (to match old PEP 7 style), but have all new files use 4 spaces (to match current PEP 7 style). ........ r51676 | fred.drake | 2006-09-01 05:57:19 +0200 (Fri, 01 Sep 2006) | 3 lines - SF patch #1550263: Enhance and correct unittest docs - various minor cleanups for improved consistency ........ r51677 | georg.brandl | 2006-09-02 00:30:52 +0200 (Sat, 02 Sep 2006) | 2 lines evalfile() should be execfile(). ........ r51681 | neal.norwitz | 2006-09-02 04:43:17 +0200 (Sat, 02 Sep 2006) | 1 line SF #1547931, fix typo (missing and). Will backport to 2.5 ........ r51683 | neal.norwitz | 2006-09-02 04:50:35 +0200 (Sat, 02 Sep 2006) | 1 line Bug #1548092: fix curses.tparm seg fault on invalid input. Needs backport to 2.5.1 and earlier. ........ r51684 | neal.norwitz | 2006-09-02 04:58:13 +0200 (Sat, 02 Sep 2006) | 4 lines Bug #1550714: fix SystemError from itertools.tee on negative value for n. Needs backport to 2.5.1 and earlier. ........ r51685 | nick.coghlan | 2006-09-02 05:54:17 +0200 (Sat, 02 Sep 2006) | 1 line Make decimal.ContextManager a private implementation detail of decimal.localcontext() ........ r51686 | nick.coghlan | 2006-09-02 06:04:18 +0200 (Sat, 02 Sep 2006) | 1 line Further corrections to the decimal module context management documentation ........ r51688 | raymond.hettinger | 2006-09-02 19:07:23 +0200 (Sat, 02 Sep 2006) | 1 line Fix documentation nits for decimal context managers. ........ r51690 | neal.norwitz | 2006-09-02 20:51:34 +0200 (Sat, 02 Sep 2006) | 1 line Add missing word in comment ........ r51691 | neal.norwitz | 2006-09-02 21:40:19 +0200 (Sat, 02 Sep 2006) | 7 lines Hmm, this test has failed at least twice recently on the OpenBSD and Debian sparc buildbots. Since this goes through a lot of tests and hits the disk a lot it could be slow (especially if NFS is involved). I'm not sure if that's the problem, but printing periodic msgs shouldn't hurt. The code was stolen from test_compiler. ........ r51693 | nick.coghlan | 2006-09-03 03:02:00 +0200 (Sun, 03 Sep 2006) | 1 line Fix final documentation nits before backporting decimal module fixes to 2.5 ........ r51694 | nick.coghlan | 2006-09-03 03:06:07 +0200 (Sun, 03 Sep 2006) | 1 line Typo fix for decimal docs ........ r51697 | nick.coghlan | 2006-09-03 03:20:46 +0200 (Sun, 03 Sep 2006) | 1 line NEWS entry on trunk for decimal module changes ........ r51704 | raymond.hettinger | 2006-09-04 17:32:48 +0200 (Mon, 04 Sep 2006) | 1 line Fix endcase for str.rpartition() ........ r51716 | tim.peters | 2006-09-05 04:18:09 +0200 (Tue, 05 Sep 2006) | 12 lines "Conceptual" merge of rev 51711 from the 2.5 branch. i_divmod(): As discussed on Python-Dev, changed the overflow checking to live happily with recent gcc optimizations that assume signed integer arithmetic never overflows. This differs from the corresponding change on the 2.5 and 2.4 branches, using a less obscure approach, but one that /may/ tickle platform idiocies in their definitions of LONG_MIN. The 2.4 + 2.5 change avoided introducing a dependence on LONG_MIN, at the cost of substantially goofier code. ........ r51717 | tim.peters | 2006-09-05 04:21:19 +0200 (Tue, 05 Sep 2006) | 2 lines Whitespace normalization. ........ r51719 | tim.peters | 2006-09-05 04:22:17 +0200 (Tue, 05 Sep 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r51720 | neal.norwitz | 2006-09-05 04:24:03 +0200 (Tue, 05 Sep 2006) | 2 lines Fix SF bug #1546288, crash in dict_equal. ........ r51721 | neal.norwitz | 2006-09-05 04:25:41 +0200 (Tue, 05 Sep 2006) | 1 line Fix SF #1552093, eval docstring typo (3 ps in mapping) ........ r51724 | neal.norwitz | 2006-09-05 04:35:08 +0200 (Tue, 05 Sep 2006) | 1 line This was found by Guido AFAIK on p3yk (sic) branch. ........ r51725 | neal.norwitz | 2006-09-05 04:36:20 +0200 (Tue, 05 Sep 2006) | 1 line Add a NEWS entry for str.rpartition() change ........ r51728 | neal.norwitz | 2006-09-05 04:57:01 +0200 (Tue, 05 Sep 2006) | 1 line Patch #1540470, for OpenBSD 4.0. Backport candidate for 2.[34]. ........ r51729 | neal.norwitz | 2006-09-05 05:53:08 +0200 (Tue, 05 Sep 2006) | 12 lines Bug #1520864 (again): unpacking singleton tuples in list comprehensions and generator expressions (x for x, in ... ) works again. Sigh, I only fixed for loops the first time, not list comps and genexprs too. I couldn't find any more unpacking cases where there is a similar bug lurking. This code should be refactored to eliminate the duplication. I'm sure the listcomp/genexpr code can be refactored. I'm not sure if the for loop can re-use any of the same code though. Will backport to 2.5 (the only place it matters). ........ r51731 | neal.norwitz | 2006-09-05 05:58:26 +0200 (Tue, 05 Sep 2006) | 1 line Add a comment about some refactoring. (There's probably more that should be done.) I will reformat this file in the next checkin due to the inconsistent tabs/spaces. ........ r51732 | neal.norwitz | 2006-09-05 06:00:12 +0200 (Tue, 05 Sep 2006) | 1 line M-x untabify ........ r51737 | hyeshik.chang | 2006-09-05 14:07:09 +0200 (Tue, 05 Sep 2006) | 7 lines Fix a few bugs on cjkcodecs found by Oren Tirosh: - gbk and gb18030 codec now handle U+30FB KATAKANA MIDDLE DOT correctly. - iso2022_jp_2 codec now encodes into G0 for KS X 1001, GB2312 codepoints to conform the standard. - iso2022_jp_3 and iso2022_jp_2004 codec can encode JIS X 2013:2 codepoints now. ........ r51738 | hyeshik.chang | 2006-09-05 14:14:57 +0200 (Tue, 05 Sep 2006) | 2 lines Fix a typo: 2013 -> 0213 ........ r51740 | georg.brandl | 2006-09-05 14:44:58 +0200 (Tue, 05 Sep 2006) | 3 lines Bug #1552618: change docs of dict.has_key() to reflect recommendation to use "in". ........ r51742 | andrew.kuchling | 2006-09-05 15:02:40 +0200 (Tue, 05 Sep 2006) | 1 line Rearrange example a bit, and show rpartition() when separator is not found ........ r51744 | andrew.kuchling | 2006-09-05 15:15:41 +0200 (Tue, 05 Sep 2006) | 1 line [Bug #1525469] SimpleXMLRPCServer still uses the sys.exc_{value,type} module-level globals instead of calling sys.exc_info(). Reported by Russell Warren ........ r51745 | andrew.kuchling | 2006-09-05 15:19:18 +0200 (Tue, 05 Sep 2006) | 3 lines [Bug #1526834] Fix crash in pdb when you do 'b f('; the function name was placed into a regex pattern and the unbalanced paren caused re.compile() to report an error ........ r51751 | kristjan.jonsson | 2006-09-05 19:58:12 +0200 (Tue, 05 Sep 2006) | 6 lines Update the PCBuild8 solution. Facilitate cross-compilation by having binaries in separate Win32 and x64 directories. Rationalized configs by making proper use of platforms/configurations. Remove pythoncore_pgo project. Add new PGIRelease and PGORelease configurations to perform Profile Guided Optimisation. Removed I64 support, but this can be easily added by copying the x64 platform settings. ........ r51758 | gustavo.niemeyer | 2006-09-06 03:58:52 +0200 (Wed, 06 Sep 2006) | 3 lines Fixing #1531862: Do not close standard file descriptors in the subprocess module. ........ r51760 | neal.norwitz | 2006-09-06 05:58:34 +0200 (Wed, 06 Sep 2006) | 1 line Revert 51758 because it broke all the buildbots ........ r51762 | georg.brandl | 2006-09-06 08:03:59 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1551427: fix a wrong NULL pointer check in the win32 version of os.urandom(). ........ r51765 | georg.brandl | 2006-09-06 08:09:31 +0200 (Wed, 06 Sep 2006) | 3 lines Bug #1550983: emit better error messages for erroneous relative imports (if not in package and if beyond toplevel package). ........ r51767 | neal.norwitz | 2006-09-06 08:28:06 +0200 (Wed, 06 Sep 2006) | 1 line with and as are now keywords. There are some generated files I can't recreate. ........ r51770 | georg.brandl | 2006-09-06 08:50:05 +0200 (Wed, 06 Sep 2006) | 5 lines Bug #1542051: Exceptions now correctly call PyObject_GC_UnTrack. Also make sure that every exception class has __module__ set to 'exceptions'. ........ r51785 | georg.brandl | 2006-09-06 22:05:58 +0200 (Wed, 06 Sep 2006) | 2 lines Fix missing import of the types module in logging.config. ........ r51789 | marc-andre.lemburg | 2006-09-06 22:40:22 +0200 (Wed, 06 Sep 2006) | 3 lines Add news item for bug fix of SF bug report #1546372. ........ r51797 | gustavo.niemeyer | 2006-09-07 02:48:33 +0200 (Thu, 07 Sep 2006) | 3 lines Fixed subprocess bug #1531862 again, after removing tests offending buildbot ........ r51798 | raymond.hettinger | 2006-09-07 04:42:48 +0200 (Thu, 07 Sep 2006) | 1 line Fix refcounts and add error checks. ........ r51803 | nick.coghlan | 2006-09-07 12:50:34 +0200 (Thu, 07 Sep 2006) | 1 line Fix the speed regression in inspect.py by adding another cache to speed up getmodule(). Patch #1553314 ........ r51805 | ronald.oussoren | 2006-09-07 14:03:10 +0200 (Thu, 07 Sep 2006) | 2 lines Fix a glaring error and update some version numbers. ........ r51814 | andrew.kuchling | 2006-09-07 15:56:23 +0200 (Thu, 07 Sep 2006) | 1 line Typo fix ........ r51815 | andrew.kuchling | 2006-09-07 15:59:38 +0200 (Thu, 07 Sep 2006) | 8 lines [Bug #1552726] Avoid repeatedly polling in interactive mode -- only put a timeout on the select() if an input hook has been defined. Patch by Richard Boulton. This select() code is only executed with readline 2.1, or if READLINE_CALLBACKS is defined. Backport candidate for 2.5, 2.4, probably earlier versions too. ........ r51816 | armin.rigo | 2006-09-07 17:06:00 +0200 (Thu, 07 Sep 2006) | 2 lines Add a warning notice on top of the generated grammar.txt. ........ r51819 | thomas.heller | 2006-09-07 20:56:28 +0200 (Thu, 07 Sep 2006) | 5 lines Anonymous structure fields that have a bit-width specified did not work, and they gave a strange error message from PyArg_ParseTuple: function takes exactly 2 arguments (3 given). With tests. ........ r51820 | thomas.heller | 2006-09-07 21:09:54 +0200 (Thu, 07 Sep 2006) | 4 lines The cast function did not accept c_char_p or c_wchar_p instances as first argument, and failed with a 'bad argument to internal function' error message. ........ r51827 | nick.coghlan | 2006-09-08 12:04:38 +0200 (Fri, 08 Sep 2006) | 1 line Add missing NEWS entry for rev 51803 ........ r51828 | andrew.kuchling | 2006-09-08 15:25:23 +0200 (Fri, 08 Sep 2006) | 1 line Add missing word ........ r51829 | andrew.kuchling | 2006-09-08 15:35:49 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51830 | andrew.kuchling | 2006-09-08 15:36:36 +0200 (Fri, 08 Sep 2006) | 1 line Explain SQLite a bit more clearly ........ r51832 | andrew.kuchling | 2006-09-08 16:02:45 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51833 | andrew.kuchling | 2006-09-08 16:03:01 +0200 (Fri, 08 Sep 2006) | 1 line Use native SQLite types ........ r51835 | andrew.kuchling | 2006-09-08 16:05:10 +0200 (Fri, 08 Sep 2006) | 1 line Fix typo in example ........ r51837 | brett.cannon | 2006-09-09 09:11:46 +0200 (Sat, 09 Sep 2006) | 6 lines Remove the __unicode__ method from exceptions. Allows unicode() to be called on exception classes. Would require introducing a tp_unicode slot to make it work otherwise. Fixes bug #1551432 and will be backported. ........ r51854 | neal.norwitz | 2006-09-11 06:24:09 +0200 (Mon, 11 Sep 2006) | 8 lines Forward port of 51850 from release25-maint branch. As mentioned on python-dev, reverting patch #1504333 because it introduced an infinite loop in rev 47154. This patch also adds a test to prevent the regression. ........ r51855 | neal.norwitz | 2006-09-11 06:28:16 +0200 (Mon, 11 Sep 2006) | 5 lines Properly handle a NULL returned from PyArena_New(). (Also fix some whitespace) Klocwork #364. ........ r51856 | neal.norwitz | 2006-09-11 06:32:57 +0200 (Mon, 11 Sep 2006) | 1 line Add a "crasher" taken from the sgml bug report referenced in the comment ........ r51858 | georg.brandl | 2006-09-11 11:38:35 +0200 (Mon, 11 Sep 2006) | 12 lines Forward-port of rev. 51857: Building with HP's cc on HP-UX turned up a couple of problems. _PyGILState_NoteThreadState was declared as static inconsistently. Make it static as it's not necessary outside of this module. Some tests failed because errno was reset to 0. (I think the tests that failed were at least: test_fcntl and test_mailbox). Ensure that errno doesn't change after a call to Py_END_ALLOW_THREADS. This only affected debug builds. ........ r51865 | martin.v.loewis | 2006-09-12 21:49:20 +0200 (Tue, 12 Sep 2006) | 2 lines Forward-port 51862: Add sgml_input.html. ........ r51866 | andrew.kuchling | 2006-09-12 22:50:23 +0200 (Tue, 12 Sep 2006) | 1 line Markup typo fix ........ r51867 | andrew.kuchling | 2006-09-12 23:09:02 +0200 (Tue, 12 Sep 2006) | 1 line Some editing, markup fixes ........ r51868 | andrew.kuchling | 2006-09-12 23:21:51 +0200 (Tue, 12 Sep 2006) | 1 line More wordsmithing ........ r51877 | andrew.kuchling | 2006-09-14 13:22:18 +0200 (Thu, 14 Sep 2006) | 1 line Make --help mention that -v can be supplied multiple times ........ r51878 | andrew.kuchling | 2006-09-14 13:28:50 +0200 (Thu, 14 Sep 2006) | 1 line Rewrite help message to remove some of the parentheticals. (There were a lot of them.) ........ r51883 | ka-ping.yee | 2006-09-15 02:34:19 +0200 (Fri, 15 Sep 2006) | 2 lines Fix grammar errors and improve clarity. ........ r51885 | georg.brandl | 2006-09-15 07:22:24 +0200 (Fri, 15 Sep 2006) | 3 lines Correct elementtree module index entry. ........ r51889 | fred.drake | 2006-09-15 17:18:04 +0200 (Fri, 15 Sep 2006) | 4 lines - fix module name in links in formatted documentation - minor markup cleanup (forward-ported from release25-maint revision 51888) ........ r51891 | fred.drake | 2006-09-15 18:11:27 +0200 (Fri, 15 Sep 2006) | 3 lines revise explanation of returns_unicode to reflect bool values and to include the default value (merged from release25-maint revision 51890) ........ r51897 | martin.v.loewis | 2006-09-16 19:36:37 +0200 (Sat, 16 Sep 2006) | 2 lines Patch #1557515: Add RLIMIT_SBSIZE. ........ r51903 | ronald.oussoren | 2006-09-17 20:42:53 +0200 (Sun, 17 Sep 2006) | 2 lines Port of revision 51902 in release25-maint to the trunk ........ r51904 | ronald.oussoren | 2006-09-17 21:23:27 +0200 (Sun, 17 Sep 2006) | 3 lines Tweak Mac/Makefile in to ensure that pythonw gets rebuild when the major version of python changes (2.5 -> 2.6). Bug #1552935. ........ r51913 | guido.van.rossum | 2006-09-18 23:36:16 +0200 (Mon, 18 Sep 2006) | 2 lines Make this thing executable. ........ r51920 | gregory.p.smith | 2006-09-19 19:35:04 +0200 (Tue, 19 Sep 2006) | 5 lines Fixes a bug with bsddb.DB.stat where the flags and txn keyword arguments are transposed. (reported by Louis Zechtzer) ..already committed to release24-maint ..needs committing to release25-maint ........ r51926 | brett.cannon | 2006-09-20 20:34:28 +0200 (Wed, 20 Sep 2006) | 3 lines Accidentally didn't commit Misc/NEWS entry on when __unicode__() was removed from exceptions. ........ r51927 | brett.cannon | 2006-09-20 20:43:13 +0200 (Wed, 20 Sep 2006) | 6 lines Allow exceptions to be directly sliced again (e.g., ``BaseException(1,2,3)[0:2]``). Discovered in Python 2.5.0 by Thomas Heller and reported to python-dev. This should be backported to 2.5 . ........ r51928 | brett.cannon | 2006-09-20 21:28:35 +0200 (Wed, 20 Sep 2006) | 2 lines Make python.vim output more deterministic. ........ r51949 | walter.doerwald | 2006-09-21 17:09:55 +0200 (Thu, 21 Sep 2006) | 2 lines Fix typo. ........ r51950 | jack.diederich | 2006-09-21 19:50:26 +0200 (Thu, 21 Sep 2006) | 5 lines * regression bug, count_next was coercing a Py_ssize_t to an unsigned Py_size_t which breaks negative counts * added test for negative numbers will backport to 2.5.1 ........ r51953 | jack.diederich | 2006-09-21 22:34:49 +0200 (Thu, 21 Sep 2006) | 1 line added itertools.count(-n) fix ........ r51971 | neal.norwitz | 2006-09-22 10:16:26 +0200 (Fri, 22 Sep 2006) | 10 lines Fix %zd string formatting on Mac OS X so it prints negative numbers. In addition to testing positive numbers, verify negative numbers work in configure. In order to avoid compiler warnings on OS X 10.4, also change the order of the check for the format character to use (PY_FORMAT_SIZE_T) in the sprintf format for Py_ssize_t. This patch changes PY_FORMAT_SIZE_T from "" to "l" if it wasn't defined at configure time. Need to verify the buildbot results. Backport candidate (if everyone thinks this patch can't be improved). ........ r51972 | neal.norwitz | 2006-09-22 10:18:10 +0200 (Fri, 22 Sep 2006) | 7 lines Bug #1557232: fix seg fault with def f((((x)))) and def f(((x),)). These tests should be improved. Hopefully this fixes variations when flipping back and forth between fpdef and fplist. Backport candidate. ........ r51975 | neal.norwitz | 2006-09-22 10:47:23 +0200 (Fri, 22 Sep 2006) | 4 lines Mostly revert this file to the same version as before. Only force setting of PY_FORMAT_SIZE_T to "l" for Mac OSX. I don't know a better define to use. This should get rid of the warnings on other platforms and Mac too. ........ r51986 | fred.drake | 2006-09-23 02:26:31 +0200 (Sat, 23 Sep 2006) | 1 line add boilerplate "What's New" document so the docs will build ........ r51987 | neal.norwitz | 2006-09-23 06:11:38 +0200 (Sat, 23 Sep 2006) | 1 line Remove extra semi-colons reported by Johnny Lee on python-dev. Backport if anyone cares. ........ r51989 | neal.norwitz | 2006-09-23 20:11:58 +0200 (Sat, 23 Sep 2006) | 1 line SF Bug #1563963, add missing word and cleanup first sentance ........ r51990 | brett.cannon | 2006-09-23 21:53:20 +0200 (Sat, 23 Sep 2006) | 3 lines Make output on test_strptime() be more verbose in face of failure. This is in hopes that more information will help debug the failing test on HPPA Ubuntu. ........ r51991 | georg.brandl | 2006-09-24 12:36:01 +0200 (Sun, 24 Sep 2006) | 2 lines Fix webbrowser.BackgroundBrowser on Windows. ........ r51993 | georg.brandl | 2006-09-24 14:35:36 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in the parser's future statement handling that led to "with" not being recognized as a keyword after, e.g., this statement: from __future__ import division, with_statement ........ r51995 | georg.brandl | 2006-09-24 14:50:24 +0200 (Sun, 24 Sep 2006) | 4 lines Fix a bug in traceback.format_exception_only() that led to an error being raised when print_exc() was called without an exception set. In version 2.4, this printed "None", restored that behavior. ........ r52000 | armin.rigo | 2006-09-25 17:16:26 +0200 (Mon, 25 Sep 2006) | 2 lines Another crasher. ........ r52011 | brett.cannon | 2006-09-27 01:38:24 +0200 (Wed, 27 Sep 2006) | 2 lines Make the error message for when the time data and format do not match clearer. ........ r52014 | andrew.kuchling | 2006-09-27 18:37:30 +0200 (Wed, 27 Sep 2006) | 1 line Add news item for rev. 51815 ........ r52018 | andrew.kuchling | 2006-09-27 21:23:05 +0200 (Wed, 27 Sep 2006) | 1 line Make examples do error checking on Py_InitModule ........ r52032 | brett.cannon | 2006-09-29 00:10:14 +0200 (Fri, 29 Sep 2006) | 2 lines Very minor grammatical fix in a comment. ........ r52048 | george.yoshida | 2006-09-30 07:14:02 +0200 (Sat, 30 Sep 2006) | 4 lines SF bug #1567976 : fix typo Will backport to 2.5. ........ r52051 | gregory.p.smith | 2006-09-30 08:08:20 +0200 (Sat, 30 Sep 2006) | 2 lines wording change ........ r52053 | georg.brandl | 2006-09-30 09:24:48 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1567375: a minor logical glitch in example description. ........ r52056 | georg.brandl | 2006-09-30 09:31:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1565661: in webbrowser, split() the command for the default GNOME browser in case it is a command with args. ........ r52058 | georg.brandl | 2006-09-30 10:43:30 +0200 (Sat, 30 Sep 2006) | 4 lines Patch #1567691: super() and new.instancemethod() now don't accept keyword arguments any more (previously they accepted them, but didn't use them). ........ r52061 | georg.brandl | 2006-09-30 11:03:42 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566800: make sure that EnvironmentError can be called with any number of arguments, as was the case in Python 2.4. ........ r52063 | georg.brandl | 2006-09-30 11:06:45 +0200 (Sat, 30 Sep 2006) | 2 lines Bug #1566663: remove obsolete example from datetime docs. ........ r52065 | georg.brandl | 2006-09-30 11:13:21 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1566602: correct failure of posixpath unittest when $HOME ends with a slash. ........ r52068 | georg.brandl | 2006-09-30 12:58:01 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1457823: cgi.(Sv)FormContentDict's constructor now takes keep_blank_values and strict_parsing keyword arguments. ........ r52069 | georg.brandl | 2006-09-30 13:06:47 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1560617: in pyclbr, return full module name not only for classes, but also for functions. ........ r52072 | georg.brandl | 2006-09-30 13:17:34 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1556784: allow format strings longer than 127 characters in datetime's strftime function. ........ r52075 | georg.brandl | 2006-09-30 13:22:28 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1446043: correctly raise a LookupError if an encoding name given to encodings.search_function() contains a dot. ........ r52078 | georg.brandl | 2006-09-30 14:02:57 +0200 (Sat, 30 Sep 2006) | 3 lines Bug #1546052: clarify that PyString_FromString(AndSize) copies the string pointed to by its parameter. ........ r52080 | georg.brandl | 2006-09-30 14:16:03 +0200 (Sat, 30 Sep 2006) | 3 lines Convert test_import to unittest. ........ r52083 | kurt.kaiser | 2006-10-01 23:16:45 +0200 (Sun, 01 Oct 2006) | 5 lines Some syntax errors were being caught by tokenize during the tabnanny check, resulting in obscure error messages. Do the syntax check first. Bug 1562716, 1562719 ........ r52084 | kurt.kaiser | 2006-10-01 23:54:37 +0200 (Sun, 01 Oct 2006) | 3 lines Add comment explaining that error msgs may be due to user code when running w/o subprocess. ........ r52086 | martin.v.loewis | 2006-10-02 16:55:51 +0200 (Mon, 02 Oct 2006) | 3 lines Fix test for uintptr_t. Fixes #1568842. Will backport. ........ r52089 | martin.v.loewis | 2006-10-02 17:20:37 +0200 (Mon, 02 Oct 2006) | 3 lines Guard uintptr_t test with HAVE_STDINT_H, test for stdint.h. Will backport. ........ r52100 | vinay.sajip | 2006-10-03 20:02:37 +0200 (Tue, 03 Oct 2006) | 1 line Documentation omitted the additional parameter to LogRecord.__init__ which was added in 2.5. (See SF #1569622). ........ r52101 | vinay.sajip | 2006-10-03 20:20:26 +0200 (Tue, 03 Oct 2006) | 1 line Documentation clarified to mention optional parameters. ........ r52102 | vinay.sajip | 2006-10-03 20:21:56 +0200 (Tue, 03 Oct 2006) | 1 line Modified LogRecord.__init__ to make the func parameter optional. (See SF #1569622). ........ r52121 | brett.cannon | 2006-10-03 23:58:55 +0200 (Tue, 03 Oct 2006) | 2 lines Fix minor typo in a comment. ........ r52123 | brett.cannon | 2006-10-04 01:23:14 +0200 (Wed, 04 Oct 2006) | 2 lines Convert test_imp over to unittest. ........ r52128 | barry.warsaw | 2006-10-04 04:06:36 +0200 (Wed, 04 Oct 2006) | 3 lines decode_rfc2231(): As Christian Robottom Reis points out, it makes no sense to test for parts > 3 when we use .split(..., 2). ........ r52129 | jeremy.hylton | 2006-10-04 04:24:52 +0200 (Wed, 04 Oct 2006) | 9 lines Fix for SF bug 1569998: break permitted inside try. The compiler was checking that there was something on the fblock stack, but not that there was a loop on the stack. Fixed that and added a test for the specific syntax error. Bug fix candidate. ........ r52130 | martin.v.loewis | 2006-10-04 07:47:34 +0200 (Wed, 04 Oct 2006) | 4 lines Fix integer negation and absolute value to not rely on undefined behaviour of the C compiler anymore. Will backport to 2.5 and 2.4. ........ r52135 | martin.v.loewis | 2006-10-04 11:21:20 +0200 (Wed, 04 Oct 2006) | 1 line Forward port r52134: Add uuids for 2.4.4. ........ r52137 | armin.rigo | 2006-10-04 12:23:57 +0200 (Wed, 04 Oct 2006) | 3 lines Compilation problem caused by conflicting typedefs for uint32_t (unsigned long vs. unsigned int). ........ r52139 | armin.rigo | 2006-10-04 14:17:45 +0200 (Wed, 04 Oct 2006) | 23 lines Forward-port of r52136,52138: a review of overflow-detecting code. * unified the way intobject, longobject and mystrtoul handle values around -sys.maxint-1. * in general, trying to entierely avoid overflows in any computation involving signed ints or longs is extremely involved. Fixed a few simple cases where a compiler might be too clever (but that's all guesswork). * more overflow checks against bad data in marshal.c. * 2.5 specific: fixed a number of places that were still confusing int and Py_ssize_t. Some of them could potentially have caused "real-world" breakage. * list.pop(x): fixing overflow issues on x was messy. I just reverted to PyArg_ParseTuple("n"), which does the right thing. (An obscure test was trying to give a Decimal to list.pop()... doesn't make sense any more IMHO) * trying to write a few tests... ........ r52147 | andrew.kuchling | 2006-10-04 15:42:43 +0200 (Wed, 04 Oct 2006) | 6 lines Cause a PyObject_Malloc() failure to trigger a MemoryError, and then add 'if (PyErr_Occurred())' checks to various places so that NULL is returned properly. 2.4 backport candidate. ........ r52148 | martin.v.loewis | 2006-10-04 17:25:28 +0200 (Wed, 04 Oct 2006) | 1 line Add MSVC8 project files to create wininst-8.exe. ........ r52196 | brett.cannon | 2006-10-06 00:02:31 +0200 (Fri, 06 Oct 2006) | 7 lines Clarify what "re-initialization" means for init_builtin() and init_dynamic(). Also remove warning about re-initialization as possibly raising an execption as both call _PyImport_FindExtension() which pulls any module that was already imported from the Python process' extension cache and just copies the __dict__ into the module stored in sys.modules. ........ r52200 | fred.drake | 2006-10-06 02:03:45 +0200 (Fri, 06 Oct 2006) | 3 lines - update links - remove Sleepycat name now that they have been bought ........ r52204 | andrew.kuchling | 2006-10-06 12:41:01 +0200 (Fri, 06 Oct 2006) | 1 line Case fix ........ r52208 | georg.brandl | 2006-10-06 14:46:08 +0200 (Fri, 06 Oct 2006) | 3 lines Fix name. ........ r52211 | andrew.kuchling | 2006-10-06 15:18:26 +0200 (Fri, 06 Oct 2006) | 1 line [Bug #1545341] Allow 'classifier' parameter to be a tuple as well as a list. Will backport. ........ r52212 | armin.rigo | 2006-10-06 18:33:22 +0200 (Fri, 06 Oct 2006) | 4 lines A very minor bug fix: this code looks like it is designed to accept any hue value and do the modulo itself, except it doesn't quite do it in all cases. At least, the "cannot get here" comment was wrong. ........ r52213 | andrew.kuchling | 2006-10-06 20:51:55 +0200 (Fri, 06 Oct 2006) | 1 line Comment grammar ........ r52218 | skip.montanaro | 2006-10-07 13:05:02 +0200 (Sat, 07 Oct 2006) | 6 lines Note that the excel_tab class is registered as the "excel-tab" dialect. Fixes 1572471. Make a similar change for the excel class and clean up references to the Dialects and Formatting Parameters section in a few places. ........ r52221 | georg.brandl | 2006-10-08 09:11:54 +0200 (Sun, 08 Oct 2006) | 3 lines Add missing NEWS entry for rev. 52129. ........ r52223 | hyeshik.chang | 2006-10-08 15:48:34 +0200 (Sun, 08 Oct 2006) | 3 lines Bug #1572832: fix a bug in ISO-2022 codecs which may cause segfault when encoding non-BMP unicode characters. (Submitted by Ray Chason) ........ r52227 | ronald.oussoren | 2006-10-08 19:37:58 +0200 (Sun, 08 Oct 2006) | 4 lines Add version number to the link to the python documentation in /Developer/Documentation/Python, better for users that install multiple versions of python. ........ r52229 | ronald.oussoren | 2006-10-08 19:40:02 +0200 (Sun, 08 Oct 2006) | 2 lines Fix for bug #1570284 ........ r52233 | ronald.oussoren | 2006-10-08 19:49:52 +0200 (Sun, 08 Oct 2006) | 6 lines MacOSX: distutils changes the values of BASECFLAGS and LDFLAGS when using a universal build of python on OSX 10.3 to ensure that those flags can be used to compile code (the universal build uses compiler flags that aren't supported on 10.3). This patches gives the same treatment to CFLAGS, PY_CFLAGS and BLDSHARED. ........ r52236 | ronald.oussoren | 2006-10-08 19:51:46 +0200 (Sun, 08 Oct 2006) | 5 lines MacOSX: The universal build requires that users have the MacOSX10.4u SDK installed to build extensions. This patch makes distutils emit a warning when the compiler should use an SDK but that SDK is not installed, hopefully reducing some confusion. ........ r52238 | ronald.oussoren | 2006-10-08 20:18:26 +0200 (Sun, 08 Oct 2006) | 3 lines MacOSX: add more logic to recognize the correct startup file to patch to the shell profile patching post-install script. ........ r52242 | andrew.kuchling | 2006-10-09 19:10:12 +0200 (Mon, 09 Oct 2006) | 1 line Add news item for rev. 52211 change ........ r52245 | andrew.kuchling | 2006-10-09 20:05:19 +0200 (Mon, 09 Oct 2006) | 1 line Fix wording in comment ........ r52251 | georg.brandl | 2006-10-09 21:03:06 +0200 (Mon, 09 Oct 2006) | 2 lines Patch #1572724: fix typo ('=' instead of '==') in _msi.c. ........ r52255 | barry.warsaw | 2006-10-09 21:43:24 +0200 (Mon, 09 Oct 2006) | 2 lines List gc.get_count() in the module docstring. ........ r52257 | martin.v.loewis | 2006-10-09 22:44:25 +0200 (Mon, 09 Oct 2006) | 1 line Bug #1565150: Fix subsecond processing for os.utime on Windows. ........ r52268 | ronald.oussoren | 2006-10-10 09:55:06 +0200 (Tue, 10 Oct 2006) | 2 lines MacOSX: fix permission problem in the generated installer ........ r52293 | georg.brandl | 2006-10-12 09:38:04 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1575746: fix typo in property() docs. ........ r52295 | georg.brandl | 2006-10-12 09:57:21 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #813342: Start the IDLE subprocess with -Qnew if the parent is started with that option. ........ r52297 | georg.brandl | 2006-10-12 10:22:53 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1565919: document set types in the Language Reference. ........ r52299 | georg.brandl | 2006-10-12 11:20:33 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1550524: better heuristics to find correct class definition in inspect.findsource(). ........ r52301 | georg.brandl | 2006-10-12 11:47:12 +0200 (Thu, 12 Oct 2006) | 4 lines Bug #1548891: The cStringIO.StringIO() constructor now encodes unicode arguments with the system default encoding just like the write() method does, instead of converting it to a raw buffer. ........ r52303 | georg.brandl | 2006-10-12 13:14:40 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1546628: add a note about urlparse.urljoin() and absolute paths. ........ r52305 | georg.brandl | 2006-10-12 13:27:59 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1545497: when given an explicit base, int() did ignore NULs embedded in the string to convert. ........ r52307 | georg.brandl | 2006-10-12 13:41:11 +0200 (Thu, 12 Oct 2006) | 3 lines Add a note to fpectl docs that it's not built by default (bug #1556261). ........ r52309 | georg.brandl | 2006-10-12 13:46:57 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560114: the Mac filesystem does have accurate information about the case of filenames. ........ r52311 | georg.brandl | 2006-10-12 13:59:27 +0200 (Thu, 12 Oct 2006) | 2 lines Small grammar fix, thanks Sjoerd. ........ r52313 | georg.brandl | 2006-10-12 14:03:07 +0200 (Thu, 12 Oct 2006) | 2 lines Fix tarfile depending on buggy int('1\0', base) behavior. ........ r52315 | georg.brandl | 2006-10-12 14:33:07 +0200 (Thu, 12 Oct 2006) | 2 lines Bug #1283491: follow docstring convention wrt. keyword-able args in sum(). ........ r52316 | georg.brandl | 2006-10-12 15:08:16 +0200 (Thu, 12 Oct 2006) | 3 lines Bug #1560179: speed up posixpath.(dir|base)name ........ r52327 | brett.cannon | 2006-10-14 08:36:45 +0200 (Sat, 14 Oct 2006) | 3 lines Clean up the language of a sentence relating to the connect() function and user-defined datatypes. ........ r52332 | neal.norwitz | 2006-10-14 23:33:38 +0200 (Sat, 14 Oct 2006) | 3 lines Update the peephole optimizer to remove more dead code (jumps after returns) and inline jumps to returns. ........ r52333 | martin.v.loewis | 2006-10-15 09:54:40 +0200 (Sun, 15 Oct 2006) | 4 lines Patch #1576954: Update VC6 build directory; remove redundant files in VC7. Will backport to 2.5. ........ r52335 | martin.v.loewis | 2006-10-15 10:43:33 +0200 (Sun, 15 Oct 2006) | 1 line Patch #1576166: Support os.utime for directories on Windows NT+. ........ r52336 | martin.v.loewis | 2006-10-15 10:51:22 +0200 (Sun, 15 Oct 2006) | 2 lines Patch #1577551: Add ctypes and ET build support for VC6. Will backport to 2.5. ........ r52338 | martin.v.loewis | 2006-10-15 11:35:51 +0200 (Sun, 15 Oct 2006) | 1 line Loosen the test for equal time stamps. ........ r52339 | martin.v.loewis | 2006-10-15 11:43:39 +0200 (Sun, 15 Oct 2006) | 2 lines Bug #1567666: Emulate GetFileAttributesExA for Win95. Will backport to 2.5. ........ r52341 | martin.v.loewis | 2006-10-15 13:02:07 +0200 (Sun, 15 Oct 2006) | 2 lines Round to int, because some systems support sub-second time stamps in stat, but not in utime. Also be consistent with modifying only mtime, not atime. ........ r52342 | martin.v.loewis | 2006-10-15 13:57:40 +0200 (Sun, 15 Oct 2006) | 2 lines Set the eol-style for project files to "CRLF". ........ r52343 | martin.v.loewis | 2006-10-15 13:59:56 +0200 (Sun, 15 Oct 2006) | 3 lines Drop binary property on dsp files, set eol-style to CRLF instead. ........ r52344 | martin.v.loewis | 2006-10-15 14:01:43 +0200 (Sun, 15 Oct 2006) | 2 lines Remove binary property, set eol-style to CRLF instead. ........ r52346 | martin.v.loewis | 2006-10-15 16:30:38 +0200 (Sun, 15 Oct 2006) | 2 lines Mention the bdist_msi module. Will backport to 2.5. ........ r52354 | brett.cannon | 2006-10-16 05:09:52 +0200 (Mon, 16 Oct 2006) | 3 lines Fix turtle so that you can launch the demo2 function on its own instead of only when the module is launched as a script. ........ r52356 | martin.v.loewis | 2006-10-17 17:18:06 +0200 (Tue, 17 Oct 2006) | 2 lines Patch #1457736: Update VC6 to use current PCbuild settings. Will backport to 2.5. ........ r52360 | martin.v.loewis | 2006-10-17 20:09:55 +0200 (Tue, 17 Oct 2006) | 2 lines Remove obsolete file. Will backport. ........ r52363 | martin.v.loewis | 2006-10-17 20:59:23 +0200 (Tue, 17 Oct 2006) | 4 lines Forward-port r52358: - Bug #1578513: Cross compilation was broken by a change to configure. Repair so that it's back to how it was in 2.4.3. ........ r52365 | thomas.heller | 2006-10-17 21:30:48 +0200 (Tue, 17 Oct 2006) | 6 lines ctypes callback functions only support 'fundamental' result types. Check this and raise an error when something else is used - before this change ctypes would hang or crash when such a callback was called. This is a partial fix for #1574584. Will backport to release25-maint. ........ r52377 | tim.peters | 2006-10-18 07:06:06 +0200 (Wed, 18 Oct 2006) | 2 lines newIobject(): repaired incorrect cast to quiet MSVC warning. ........ r52378 | tim.peters | 2006-10-18 07:09:12 +0200 (Wed, 18 Oct 2006) | 2 lines Whitespace normalization. ........ r52379 | tim.peters | 2006-10-18 07:10:28 +0200 (Wed, 18 Oct 2006) | 2 lines Add missing svn:eol-style to text files. ........ r52387 | martin.v.loewis | 2006-10-19 12:58:46 +0200 (Thu, 19 Oct 2006) | 3 lines Add check for the PyArg_ParseTuple format, and declare it if it is supported. ........ r52388 | martin.v.loewis | 2006-10-19 13:00:37 +0200 (Thu, 19 Oct 2006) | 3 lines Fix various minor errors in passing arguments to PyArg_ParseTuple. ........ r52389 | martin.v.loewis | 2006-10-19 18:01:37 +0200 (Thu, 19 Oct 2006) | 2 lines Restore CFLAGS after checking for __attribute__ ........ r52390 | andrew.kuchling | 2006-10-19 23:55:55 +0200 (Thu, 19 Oct 2006) | 1 line [Bug #1576348] Fix typo in example ........ r52414 | walter.doerwald | 2006-10-22 10:59:41 +0200 (Sun, 22 Oct 2006) | 2 lines Port test___future__ to unittest. ........ r52415 | ronald.oussoren | 2006-10-22 12:45:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580674: with this patch os.readlink uses the filesystem encoding to decode unicode objects and returns an unicode object when the argument is one. ........ r52416 | martin.v.loewis | 2006-10-22 12:46:18 +0200 (Sun, 22 Oct 2006) | 3 lines Patch #1580872: Remove duplicate declaration of PyCallable_Check. Will backport to 2.5. ........ r52418 | martin.v.loewis | 2006-10-22 12:55:15 +0200 (Sun, 22 Oct 2006) | 4 lines - Patch #1560695: Add .note.GNU-stack to ctypes' sysv.S so that ctypes isn't considered as requiring executable stacks. Will backport to 2.5. ........ r52420 | martin.v.loewis | 2006-10-22 15:45:13 +0200 (Sun, 22 Oct 2006) | 3 lines Remove passwd.adjunct.byname from list of maps for test_nis. Will backport to 2.5. ........ r52431 | georg.brandl | 2006-10-24 18:54:16 +0200 (Tue, 24 Oct 2006) | 2 lines Patch [ 1583506 ] tarfile.py: 100-char filenames are truncated ........ r52446 | andrew.kuchling | 2006-10-26 21:10:46 +0200 (Thu, 26 Oct 2006) | 1 line [Bug #1579796] Wrong syntax for PyDateTime_IMPORT in documentation. Reported by David Faure. ........ r52449 | andrew.kuchling | 2006-10-26 21:16:46 +0200 (Thu, 26 Oct 2006) | 1 line Typo fix ........ r52452 | martin.v.loewis | 2006-10-27 08:16:31 +0200 (Fri, 27 Oct 2006) | 3 lines Patch #1549049: Rewrite type conversion in structmember. Fixes #1545696 and #1566140. Will backport to 2.5. ........ r52454 | martin.v.loewis | 2006-10-27 08:42:27 +0200 (Fri, 27 Oct 2006) | 2 lines Check for values.h. Will backport. ........ r52456 | martin.v.loewis | 2006-10-27 09:06:52 +0200 (Fri, 27 Oct 2006) | 2 lines Get DBL_MAX from float.h not values.h. Will backport. ........ r52458 | martin.v.loewis | 2006-10-27 09:13:28 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1567274: Support SMTP over TLS. ........ r52459 | andrew.kuchling | 2006-10-27 13:33:29 +0200 (Fri, 27 Oct 2006) | 1 line Set svn:keywords property ........ r52460 | andrew.kuchling | 2006-10-27 13:36:41 +0200 (Fri, 27 Oct 2006) | 1 line Add item ........ r52461 | andrew.kuchling | 2006-10-27 13:37:01 +0200 (Fri, 27 Oct 2006) | 1 line Some wording changes and markup fixes ........ r52462 | andrew.kuchling | 2006-10-27 14:18:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1585690] Note that line_num was added in Python 2.5 ........ r52464 | andrew.kuchling | 2006-10-27 14:50:38 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1583946] Reword description of server and issuer ........ r52466 | andrew.kuchling | 2006-10-27 15:06:25 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1562583] Mention the set_reuse_addr() method ........ r52469 | andrew.kuchling | 2006-10-27 15:22:46 +0200 (Fri, 27 Oct 2006) | 4 lines [Bug #1542016] Report PCALL_POP value. This makes the return value of sys.callstats() match its docstring. Backport candidate. Though it's an API change, this is a pretty obscure portion of the API. ........ r52473 | andrew.kuchling | 2006-10-27 16:53:41 +0200 (Fri, 27 Oct 2006) | 1 line Point users to the subprocess module in the docs for os.system, os.spawn*, os.popen2, and the popen2 and commands modules ........ r52476 | andrew.kuchling | 2006-10-27 18:39:10 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1576241] Let functools.wraps work with built-in functions ........ r52478 | andrew.kuchling | 2006-10-27 18:55:34 +0200 (Fri, 27 Oct 2006) | 1 line [Bug #1575506] The _singlefileMailbox class was using the wrong file object in its flush() method, causing an error ........ r52480 | andrew.kuchling | 2006-10-27 19:06:16 +0200 (Fri, 27 Oct 2006) | 1 line Clarify docstring ........ r52481 | andrew.kuchling | 2006-10-27 19:11:23 +0200 (Fri, 27 Oct 2006) | 5 lines [Patch #1574068 by Scott Dial] urllib and urllib2 were using base64.encodestring() for encoding authentication data. encodestring() can include newlines for very long input, which produced broken HTTP headers. ........ r52483 | andrew.kuchling | 2006-10-27 20:13:46 +0200 (Fri, 27 Oct 2006) | 1 line Check db_setup_debug for a few print statements; change sqlite_setup_debug to False ........ r52484 | andrew.kuchling | 2006-10-27 20:15:02 +0200 (Fri, 27 Oct 2006) | 1 line [Patch #1503717] Tiny patch from Chris AtLee to stop a lengthy line from being printed ........ r52485 | thomas.heller | 2006-10-27 20:31:36 +0200 (Fri, 27 Oct 2006) | 5 lines WindowsError.str should display the windows error code, not the posix error code; with test. Fixes #1576174. Will backport to release25-maint. ........ r52487 | thomas.heller | 2006-10-27 21:05:53 +0200 (Fri, 27 Oct 2006) | 4 lines Modulefinder now handles absolute and relative imports, including tests. Will backport to release25-maint. ........ r52488 | georg.brandl | 2006-10-27 22:39:43 +0200 (Fri, 27 Oct 2006) | 2 lines Patch #1552024: add decorator support to unparse.py demo script. ........ r52492 | walter.doerwald | 2006-10-28 12:47:12 +0200 (Sat, 28 Oct 2006) | 2 lines Port test_bufio to unittest. ........ r52493 | georg.brandl | 2006-10-28 15:10:17 +0200 (Sat, 28 Oct 2006) | 6 lines Convert test_global, test_scope and test_grammar to unittest. I tried to enclose all tests which must be run at the toplevel (instead of inside a method) in exec statements. ........ r52494 | georg.brandl | 2006-10-28 15:11:41 +0200 (Sat, 28 Oct 2006) | 3 lines Update outstanding bugs test file. ........ r52495 | georg.brandl | 2006-10-28 15:51:49 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_math to unittest. ........ r52496 | georg.brandl | 2006-10-28 15:56:58 +0200 (Sat, 28 Oct 2006) | 3 lines Convert test_opcodes to unittest. ........ r52497 | georg.brandl | 2006-10-28 18:04:04 +0200 (Sat, 28 Oct 2006) | 2 lines Fix nth() itertool recipe. ........ r52500 | georg.brandl | 2006-10-28 22:25:09 +0200 (Sat, 28 Oct 2006) | 2 lines make test_grammar pass with python -O ........ r52501 | neal.norwitz | 2006-10-28 23:15:30 +0200 (Sat, 28 Oct 2006) | 6 lines Add some asserts. In sysmodule, I think these were to try to silence some warnings from Klokwork. They verify the assumptions of the format of svn version output. The assert in the thread module helped debug a problem on HP-UX. ........ r52502 | neal.norwitz | 2006-10-28 23:16:54 +0200 (Sat, 28 Oct 2006) | 5 lines Fix warnings with HP's C compiler. It doesn't recognize that infinite loops are, um, infinite. These conditions should not be able to happen. Will backport. ........ r52503 | neal.norwitz | 2006-10-28 23:17:51 +0200 (Sat, 28 Oct 2006) | 5 lines Fix crash in test on HP-UX. Apparently, it's not possible to delete a lock if it's held (even by the current thread). Will backport. ........ r52504 | neal.norwitz | 2006-10-28 23:19:07 +0200 (Sat, 28 Oct 2006) | 6 lines Fix bug #1565514, SystemError not raised on too many nested blocks. It seems like this should be a different error than SystemError, but I don't have any great ideas and SystemError was raised in 2.4 and earlier. Will backport. ........ r52505 | neal.norwitz | 2006-10-28 23:20:12 +0200 (Sat, 28 Oct 2006) | 4 lines Prevent crash if alloc of garbage fails. Found by Typo.pl. Will backport. ........ r52506 | neal.norwitz | 2006-10-28 23:21:00 +0200 (Sat, 28 Oct 2006) | 4 lines Don't inline Py_ADDRESS_IN_RANGE with gcc 4+ either. Will backport. ........ r52513 | neal.norwitz | 2006-10-28 23:56:49 +0200 (Sat, 28 Oct 2006) | 2 lines Fix test_modulefinder so it doesn't fail when run after test_distutils. ........ r52514 | neal.norwitz | 2006-10-29 00:12:26 +0200 (Sun, 29 Oct 2006) | 4 lines From SF 1557890, fix problem of using wrong type in example. Will backport. ........ r52517 | georg.brandl | 2006-10-29 09:39:22 +0100 (Sun, 29 Oct 2006) | 4 lines Fix codecs.EncodedFile which did not use file_encoding in 2.5.0, and fix all codecs file wrappers to work correctly with the "with" statement (bug #1586513). ........ r52519 | georg.brandl | 2006-10-29 09:47:08 +0100 (Sun, 29 Oct 2006) | 3 lines Clean up a leftover from old listcomp generation code. ........ r52520 | georg.brandl | 2006-10-29 09:53:06 +0100 (Sun, 29 Oct 2006) | 4 lines Bug #1586448: the compiler module now emits the same bytecode for list comprehensions as the builtin compiler, using the LIST_APPEND opcode. ........ r52521 | georg.brandl | 2006-10-29 10:01:01 +0100 (Sun, 29 Oct 2006) | 3 lines Remove trailing comma. ........ r52522 | georg.brandl | 2006-10-29 10:05:04 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1357915: allow all sequence types for shell arguments in subprocess. ........ r52524 | georg.brandl | 2006-10-29 10:16:12 +0100 (Sun, 29 Oct 2006) | 3 lines Patch #1583880: fix tarfile's problems with long names and posix/ GNU modes. ........ r52526 | georg.brandl | 2006-10-29 10:18:00 +0100 (Sun, 29 Oct 2006) | 3 lines Test assert if __debug__ is true. ........ r52527 | georg.brandl | 2006-10-29 10:32:16 +0100 (Sun, 29 Oct 2006) | 2 lines Fix the new EncodedFile test to work with big endian platforms. ........ r52529 | georg.brandl | 2006-10-29 15:39:09 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586613: fix zlib and bz2 codecs' incremental en/decoders. ........ r52532 | georg.brandl | 2006-10-29 19:01:08 +0100 (Sun, 29 Oct 2006) | 2 lines Bug #1586773: extend hashlib docstring. ........ r52534 | neal.norwitz | 2006-10-29 19:30:10 +0100 (Sun, 29 Oct 2006) | 4 lines Update comments, remove commented out code. Move assembler structure next to assembler code to make it easier to move it to a separate file. ........ r52535 | georg.brandl | 2006-10-29 19:31:42 +0100 (Sun, 29 Oct 2006) | 3 lines Bug #1576657: when setting a KeyError for a tuple key, make sure that the tuple isn't used as the "exception arguments tuple". ........ r52537 | georg.brandl | 2006-10-29 20:13:40 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_mmap to unittest. ........ r52538 | georg.brandl | 2006-10-29 20:20:45 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_poll to unittest. ........ r52539 | georg.brandl | 2006-10-29 20:24:43 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_nis to unittest. ........ r52540 | georg.brandl | 2006-10-29 20:35:03 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_types to unittest. ........ r52541 | georg.brandl | 2006-10-29 20:51:16 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cookie to unittest. ........ r52542 | georg.brandl | 2006-10-29 21:09:12 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_cgi to unittest. ........ r52543 | georg.brandl | 2006-10-29 21:24:01 +0100 (Sun, 29 Oct 2006) | 3 lines Completely convert test_httplib to unittest. ........ r52544 | georg.brandl | 2006-10-29 21:28:26 +0100 (Sun, 29 Oct 2006) | 2 lines Convert test_MimeWriter to unittest. ........ r52545 | georg.brandl | 2006-10-29 21:31:17 +0100 (Sun, 29 Oct 2006) | 3 lines Convert test_openpty to unittest. ........ r52546 | georg.brandl | 2006-10-29 21:35:12 +0100 (Sun, 29 Oct 2006) | 3 lines Remove leftover test output file. ........ r52547 | georg.brandl | 2006-10-29 22:54:18 +0100 (Sun, 29 Oct 2006) | 3 lines Move the check for openpty to the beginning. ........ r52548 | walter.doerwald | 2006-10-29 23:06:28 +0100 (Sun, 29 Oct 2006) | 2 lines Add tests for basic argument errors. ........ r52549 | walter.doerwald | 2006-10-30 00:02:27 +0100 (Mon, 30 Oct 2006) | 3 lines Add tests for incremental codecs with an errors argument. ........ r52550 | neal.norwitz | 2006-10-30 00:39:03 +0100 (Mon, 30 Oct 2006) | 1 line Fix refleak ........ r52552 | neal.norwitz | 2006-10-30 00:58:36 +0100 (Mon, 30 Oct 2006) | 1 line I'm assuming this is correct, it fixes the tests so they pass again ........ r52555 | vinay.sajip | 2006-10-31 18:32:37 +0100 (Tue, 31 Oct 2006) | 1 line Change to improve speed of _fixupChildren ........ r52556 | vinay.sajip | 2006-10-31 18:34:31 +0100 (Tue, 31 Oct 2006) | 1 line Added relativeCreated to Formatter doc (has been in the system for a long time - was unaccountably left out of the docs and not noticed until now). ........ r52588 | thomas.heller | 2006-11-02 20:48:24 +0100 (Thu, 02 Nov 2006) | 5 lines Replace the XXX marker in the 'Arrays and pointers' reference manual section with a link to the tutorial sections. Will backport to release25-maint. ........ r52592 | thomas.heller | 2006-11-02 21:22:29 +0100 (Thu, 02 Nov 2006) | 6 lines Fix a code example by adding a missing import. Fixes #1557890. Will backport to release25-maint. ........ r52598 | tim.peters | 2006-11-03 03:32:46 +0100 (Fri, 03 Nov 2006) | 2 lines Whitespace normalization. ........ r52619 | martin.v.loewis | 2006-11-04 19:14:06 +0100 (Sat, 04 Nov 2006) | 4 lines - Patch #1060577: Extract list of RPM files from spec file in bdist_rpm Will backport to 2.5. ........ r52621 | neal.norwitz | 2006-11-04 20:25:22 +0100 (Sat, 04 Nov 2006) | 4 lines Bug #1588287: fix invalid assertion for `1,2` in debug builds. Will backport ........ r52630 | andrew.kuchling | 2006-11-05 22:04:37 +0100 (Sun, 05 Nov 2006) | 1 line Update link ........ r52631 | skip.montanaro | 2006-11-06 15:34:52 +0100 (Mon, 06 Nov 2006) | 1 line note that user can control directory location even if default dir is used ........ r52644 | ronald.oussoren | 2006-11-07 16:53:38 +0100 (Tue, 07 Nov 2006) | 2 lines Fix a number of typos in strings and comments (sf#1589070) ........ r52647 | ronald.oussoren | 2006-11-07 17:00:34 +0100 (Tue, 07 Nov 2006) | 2 lines Whitespace changes to make the source more compliant with PEP8 (SF#1589070) ........ r52651 | thomas.heller | 2006-11-07 19:01:18 +0100 (Tue, 07 Nov 2006) | 3 lines Fix markup. Will backport to release25-maint. ........ r52653 | thomas.heller | 2006-11-07 19:20:47 +0100 (Tue, 07 Nov 2006) | 3 lines Fix grammatical error as well. Will backport to release25-maint. ........ r52657 | andrew.kuchling | 2006-11-07 21:39:16 +0100 (Tue, 07 Nov 2006) | 1 line Add missing word ........ r52662 | martin.v.loewis | 2006-11-08 07:46:37 +0100 (Wed, 08 Nov 2006) | 4 lines Correctly forward exception in instance_contains(). Fixes #1591996. Patch contributed by Neal Norwitz. Will backport. ........ r52664 | martin.v.loewis | 2006-11-08 07:48:36 +0100 (Wed, 08 Nov 2006) | 2 lines News entry for 52662. ........ r52665 | martin.v.loewis | 2006-11-08 08:35:55 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1351744: Add askyesnocancel helper for tkMessageBox. ........ r52666 | georg.brandl | 2006-11-08 08:45:59 +0100 (Wed, 08 Nov 2006) | 2 lines Patch #1592072: fix docs for return value of PyErr_CheckSignals. ........ r52668 | georg.brandl | 2006-11-08 11:04:29 +0100 (Wed, 08 Nov 2006) | 3 lines Bug #1592533: rename variable in heapq doc example, to avoid shadowing "sorted". ........ r52671 | andrew.kuchling | 2006-11-08 14:35:34 +0100 (Wed, 08 Nov 2006) | 1 line Add section on the functional module ........ r52672 | andrew.kuchling | 2006-11-08 15:14:30 +0100 (Wed, 08 Nov 2006) | 1 line Add section on operator module; make a few edits ........ r52673 | andrew.kuchling | 2006-11-08 15:24:03 +0100 (Wed, 08 Nov 2006) | 1 line Add table of contents; this required fixing a few headings. Some more smalle edits. ........ r52674 | andrew.kuchling | 2006-11-08 15:30:14 +0100 (Wed, 08 Nov 2006) | 1 line More edits ........ r52686 | martin.v.loewis | 2006-11-09 12:06:03 +0100 (Thu, 09 Nov 2006) | 3 lines Patch #838546: Make terminal become controlling in pty.fork(). Will backport to 2.5. ........ r52688 | martin.v.loewis | 2006-11-09 12:27:32 +0100 (Thu, 09 Nov 2006) | 2 lines Patch #1592250: Add elidge argument to Tkinter.Text.search. ........ r52690 | andrew.kuchling | 2006-11-09 14:27:07 +0100 (Thu, 09 Nov 2006) | 7 lines [Bug #1569790] mailbox.Maildir.get_folder() loses factory information Both the Maildir and MH classes had this bug; the patch fixes both classes and adds a test. Will backport to 25-maint. ........ r52692 | andrew.kuchling | 2006-11-09 14:51:14 +0100 (Thu, 09 Nov 2006) | 1 line [Patch #1514544 by David Watson] use fsync() to ensure data is really on disk ........ r52695 | walter.doerwald | 2006-11-09 17:23:26 +0100 (Thu, 09 Nov 2006) | 2 lines Replace C++ comment with C comment (fixes SF bug #1593525). ........ r52712 | andrew.kuchling | 2006-11-09 22:16:46 +0100 (Thu, 09 Nov 2006) | 11 lines [Patch #1514543] mailbox (Maildir): avoid losing messages on name clash Two changes: Where possible, use link()/remove() to move files into a directory; this makes it easier to avoid overwriting an existing file. Use _create_carefully() to create files in tmp/, which uses O_EXCL. Backport candidate. ........ r52716 | phillip.eby | 2006-11-10 01:33:36 +0100 (Fri, 10 Nov 2006) | 4 lines Fix SF#1566719: not creating site-packages (or other target directory) when installing .egg-info for a project that contains no modules or packages, while using --root (as in bdist_rpm). ........ r52719 | andrew.kuchling | 2006-11-10 14:14:01 +0100 (Fri, 10 Nov 2006) | 1 line Reword entry ........ r52725 | andrew.kuchling | 2006-11-10 15:39:01 +0100 (Fri, 10 Nov 2006) | 1 line [Feature request #1542920] Link to wsgi.org ........ r52731 | georg.brandl | 2006-11-11 19:29:11 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594742: wrong word in stringobject doc. ........ r52733 | georg.brandl | 2006-11-11 19:32:47 +0100 (Sat, 11 Nov 2006) | 2 lines Bug #1594758: wording improvement for dict.update() docs. ........ r52736 | martin.v.loewis | 2006-11-12 11:32:47 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1065257: Support passing open files as body in HTTPConnection.request(). ........ r52737 | martin.v.loewis | 2006-11-12 11:41:39 +0100 (Sun, 12 Nov 2006) | 2 lines Patch #1355023: support whence argument for GzipFile.seek. ........ r52738 | martin.v.loewis | 2006-11-12 19:24:26 +0100 (Sun, 12 Nov 2006) | 2 lines Bug #1067760: Deprecate passing floats to file.seek. ........ r52739 | martin.v.loewis | 2006-11-12 19:48:13 +0100 (Sun, 12 Nov 2006) | 3 lines Patch #1359217: Ignore 2xx response before 150 response. Will backport to 2.5. ........ r52741 | martin.v.loewis | 2006-11-12 19:56:03 +0100 (Sun, 12 Nov 2006) | 4 lines Patch #1360200: Use unmangled_version RPM spec field to deal with file name mangling. Will backport to 2.5. ........ r52753 | walter.doerwald | 2006-11-15 17:23:46 +0100 (Wed, 15 Nov 2006) | 2 lines Fix typo. ........ r52754 | georg.brandl | 2006-11-15 18:42:03 +0100 (Wed, 15 Nov 2006) | 2 lines Bug #1594809: add a note to README regarding PYTHONPATH and make install. ........ r52762 | georg.brandl | 2006-11-16 16:05:14 +0100 (Thu, 16 Nov 2006) | 2 lines Bug #1597576: mention that the new base64 api has been introduced in py2.4. ........ r52764 | georg.brandl | 2006-11-16 17:50:59 +0100 (Thu, 16 Nov 2006) | 3 lines Bug #1597824: return the registered function from atexit.register() to facilitate usage as a decorator. ........ r52765 | georg.brandl | 2006-11-16 18:08:45 +0100 (Thu, 16 Nov 2006) | 4 lines Bug #1588217: don't parse "= " as a soft line break in binascii's a2b_qp() function, instead leave it in the string as quopri.decode() does. ........ r52776 | andrew.kuchling | 2006-11-17 14:30:25 +0100 (Fri, 17 Nov 2006) | 17 lines Remove file-locking in MH.pack() method. This change looks massive but it's mostly a re-indenting after removing some try...finally blocks. Also adds a test case that does a pack() while the mailbox is locked; this test would have turned up bugs in the original code on some platforms. In both nmh and GNU Mailutils' implementation of MH-format mailboxes, no locking is done of individual message files when renaming them. The original mailbox.py code did do locking, which meant that message files had to be opened. This code was buggy on certain platforms (found through reading the code); there were code paths that closed the file object and then called _unlock_file() on it. Will backport to 25-maint once I see how the buildbots react to this patch. ........ r52780 | martin.v.loewis | 2006-11-18 19:00:23 +0100 (Sat, 18 Nov 2006) | 5 lines Patch #1538878: Don't make tkSimpleDialog dialogs transient if the parent window is withdrawn. This mirrors what dialog.tcl does. Will backport to 2.5. ........ r52782 | martin.v.loewis | 2006-11-18 19:05:35 +0100 (Sat, 18 Nov 2006) | 4 lines Patch #1594554: Always close a tkSimpleDialog on ok(), even if an exception occurs. Will backport to 2.5. ........ r52784 | martin.v.loewis | 2006-11-18 19:42:11 +0100 (Sat, 18 Nov 2006) | 3 lines Patch #1472877: Fix Tix subwidget name resolution. Will backport to 2.5. ........ r52786 | andrew.kuchling | 2006-11-18 23:17:33 +0100 (Sat, 18 Nov 2006) | 1 line Expand checking in test_sha ........ r52787 | georg.brandl | 2006-11-19 09:48:30 +0100 (Sun, 19 Nov 2006) | 3 lines Patch [ 1586791 ] better error msgs for some TypeErrors ........ r52788 | martin.v.loewis | 2006-11-19 11:41:41 +0100 (Sun, 19 Nov 2006) | 4 lines Make cStringIO.truncate raise IOError for negative arguments (even for -1). Fixes the last bit of #1359365. ........ r52789 | andrew.kuchling | 2006-11-19 19:40:01 +0100 (Sun, 19 Nov 2006) | 1 line Add a test case of data w/ bytes > 127 ........ r52790 | martin.v.loewis | 2006-11-19 19:51:54 +0100 (Sun, 19 Nov 2006) | 3 lines Patch #1070046: Marshal new-style objects like InstanceType in xmlrpclib. ........ r52792 | neal.norwitz | 2006-11-19 22:26:53 +0100 (Sun, 19 Nov 2006) | 4 lines Speed up function calls into the math module by using METH_O. There should be no functional changes. However, the error msgs are slightly different. Also verified that the module dict is not NULL on init. ........ r52794 | george.yoshida | 2006-11-20 03:24:48 +0100 (Mon, 20 Nov 2006) | 2 lines markup fix ........ r52795 | georg.brandl | 2006-11-20 08:12:58 +0100 (Mon, 20 Nov 2006) | 3 lines Further markup fix. ........ r52800 | andrew.kuchling | 2006-11-20 14:39:37 +0100 (Mon, 20 Nov 2006) | 2 lines Jython compatibility fix: if uu.decode() opened its output file, be sure to close it. ........ r52811 | neal.norwitz | 2006-11-21 06:26:22 +0100 (Tue, 21 Nov 2006) | 9 lines Bug #1599782: Fix segfault on bsddb.db.DB().type(). The problem is that _DB_get_type() can't be called without the GIL because it calls a bunch of PyErr_* APIs when an error occurs. There were no other cases in this file that it was called without the GIL. Removing the BEGIN/END THREAD around _DB_get_type() made everything work. Will backport. ........ r52814 | neal.norwitz | 2006-11-21 06:51:51 +0100 (Tue, 21 Nov 2006) | 1 line Oops, convert tabs to spaces ........ r52815 | neal.norwitz | 2006-11-21 07:23:44 +0100 (Tue, 21 Nov 2006) | 1 line Fix SF #1599879, socket.gethostname should ref getfqdn directly. ........ r52817 | martin.v.loewis | 2006-11-21 19:20:25 +0100 (Tue, 21 Nov 2006) | 4 lines Conditionalize definition of _CRT_SECURE_NO_DEPRECATE and _CRT_NONSTDC_NO_DEPRECATE. Will backport. ........ r52821 | martin.v.loewis | 2006-11-22 09:50:02 +0100 (Wed, 22 Nov 2006) | 4 lines Patch #1362975: Rework CodeContext indentation algorithm to avoid hard-coding pixel widths. Also make the text's scrollbar a child of the text frame, not the top widget. ........ r52826 | walter.doerwald | 2006-11-23 06:03:56 +0100 (Thu, 23 Nov 2006) | 3 lines Change decode() so that it works with a buffer (i.e. unicode(..., 'utf-8-sig')) SF bug #1601501. ........ r52833 | georg.brandl | 2006-11-23 10:55:07 +0100 (Thu, 23 Nov 2006) | 2 lines Bug #1601630: little improvement to getopt docs ........ r52835 | michael.hudson | 2006-11-23 14:54:04 +0100 (Thu, 23 Nov 2006) | 3 lines a test for an error condition not covered by existing tests (noticed this when writing the equivalent code for pypy) ........ r52839 | raymond.hettinger | 2006-11-23 22:06:03 +0100 (Thu, 23 Nov 2006) | 1 line Fix and/add typo ........ r52840 | raymond.hettinger | 2006-11-23 22:35:19 +0100 (Thu, 23 Nov 2006) | 1 line ... and the number of the counting shall be three. ........ r52841 | thomas.heller | 2006-11-24 19:45:39 +0100 (Fri, 24 Nov 2006) | 1 line Fix bug #1598620: A ctypes structure cannot contain itself. ........ r52843 | martin.v.loewis | 2006-11-25 16:39:19 +0100 (Sat, 25 Nov 2006) | 3 lines Disable _XOPEN_SOURCE on NetBSD 1.x. Will backport to 2.5 ........ r52845 | georg.brandl | 2006-11-26 20:27:47 +0100 (Sun, 26 Nov 2006) | 2 lines Bug #1603321: make pstats.Stats accept Unicode file paths. ........ r52850 | georg.brandl | 2006-11-27 19:46:21 +0100 (Mon, 27 Nov 2006) | 2 lines Bug #1603789: grammatical error in Tkinter docs. ........ r52855 | thomas.heller | 2006-11-28 21:21:54 +0100 (Tue, 28 Nov 2006) | 7 lines Fix #1563807: _ctypes built on AIX fails with ld ffi error. The contents of ffi_darwin.c must be compiled unless __APPLE__ is defined and __ppc__ is not. Will backport. ........ r52862 | armin.rigo | 2006-11-29 22:59:22 +0100 (Wed, 29 Nov 2006) | 3 lines Forgot a case where the locals can now be a general mapping instead of just a dictionary. (backporting...) ........ r52872 | guido.van.rossum | 2006-11-30 20:23:13 +0100 (Thu, 30 Nov 2006) | 2 lines Update version. ........ r52890 | walter.doerwald | 2006-12-01 17:59:47 +0100 (Fri, 01 Dec 2006) | 3 lines Move xdrlib tests from the module into a separate test script, port the tests to unittest and add a few new tests. ........ r52900 | raymond.hettinger | 2006-12-02 03:00:39 +0100 (Sat, 02 Dec 2006) | 1 line Add name to credits (for untokenize). ........ r52905 | martin.v.loewis | 2006-12-03 10:54:46 +0100 (Sun, 03 Dec 2006) | 2 lines Move IDLE news into NEWS.txt. ........ r52906 | martin.v.loewis | 2006-12-03 12:23:45 +0100 (Sun, 03 Dec 2006) | 4 lines Patch #1544279: Improve thread-safety of the socket module by moving the sock_addr_t storage out of the socket object. Will backport to 2.5. ........ r52908 | martin.v.loewis | 2006-12-03 13:01:53 +0100 (Sun, 03 Dec 2006) | 3 lines Patch #1371075: Make ConfigParser accept optional dict type for ordering, sorting, etc. ........ r52910 | matthias.klose | 2006-12-03 18:16:41 +0100 (Sun, 03 Dec 2006) | 2 lines - Fix build failure on kfreebsd and on the hurd. ........ r52915 | george.yoshida | 2006-12-04 12:41:54 +0100 (Mon, 04 Dec 2006) | 2 lines fix a versionchanged tag ........ r52917 | george.yoshida | 2006-12-05 06:39:50 +0100 (Tue, 05 Dec 2006) | 3 lines Fix pickle doc typo Patch #1608758 ........ r52938 | georg.brandl | 2006-12-06 23:21:18 +0100 (Wed, 06 Dec 2006) | 2 lines Patch #1610437: fix a tarfile bug with long filename headers. ........ r52945 | brett.cannon | 2006-12-07 00:38:48 +0100 (Thu, 07 Dec 2006) | 3 lines Fix a bad assumption that all objects assigned to '__loader__' on a module will have a '_files' attribute. ........ r52951 | georg.brandl | 2006-12-07 10:30:06 +0100 (Thu, 07 Dec 2006) | 3 lines RFE #1592899: mention string.maketrans() in docs for str.translate, remove reference to the old regex module in the former's doc. ........ r52962 | raymond.hettinger | 2006-12-08 04:17:18 +0100 (Fri, 08 Dec 2006) | 1 line Eliminate two redundant calls to PyObject_Hash(). ........ r52963 | raymond.hettinger | 2006-12-08 05:24:33 +0100 (Fri, 08 Dec 2006) | 3 lines Port Armin's fix for a dict resize vulnerability (svn revision 46589, sf bug 1456209). ........ r52964 | raymond.hettinger | 2006-12-08 05:57:50 +0100 (Fri, 08 Dec 2006) | 4 lines Port Georg's dictobject.c fix keys that were tuples got unpacked on the way to setting a KeyError (svn revision 52535, sf bug 1576657). ........ r52966 | raymond.hettinger | 2006-12-08 18:35:25 +0100 (Fri, 08 Dec 2006) | 2 lines Add test for SF bug 1576657 ........ r52970 | georg.brandl | 2006-12-08 21:46:11 +0100 (Fri, 08 Dec 2006) | 3 lines #1577756: svnversion doesn't react to LANG=C, use LC_ALL=C to force English output. ........ r52972 | georg.brandl | 2006-12-09 10:08:29 +0100 (Sat, 09 Dec 2006) | 3 lines Patch #1608267: fix a race condition in os.makedirs() is the directory to be created is already there. ........ r52975 | matthias.klose | 2006-12-09 13:15:27 +0100 (Sat, 09 Dec 2006) | 2 lines - Fix the build of the library reference in info format. ........ r52994 | neal.norwitz | 2006-12-11 02:01:06 +0100 (Mon, 11 Dec 2006) | 1 line Fix a typo ........ r52996 | georg.brandl | 2006-12-11 08:56:33 +0100 (Mon, 11 Dec 2006) | 2 lines Move errno imports back to individual functions. ........ r52998 | vinay.sajip | 2006-12-11 15:07:16 +0100 (Mon, 11 Dec 2006) | 1 line Patch by Jeremy Katz (SF #1609407) ........ r53000 | vinay.sajip | 2006-12-11 15:26:23 +0100 (Mon, 11 Dec 2006) | 1 line Patch by "cuppatea" (SF #1503765) ........
1528 lines
66 KiB
Python
1528 lines
66 KiB
Python
# Autodetecting setup.py script for building the Python extensions
|
|
#
|
|
|
|
__version__ = "$Revision$"
|
|
|
|
import sys, os, imp, re, optparse
|
|
|
|
from distutils import log
|
|
from distutils import sysconfig
|
|
from distutils import text_file
|
|
from distutils.errors import *
|
|
from distutils.core import Extension, setup
|
|
from distutils.command.build_ext import build_ext
|
|
from distutils.command.install import install
|
|
from distutils.command.install_lib import install_lib
|
|
|
|
# This global variable is used to hold the list of modules to be disabled.
|
|
disabled_module_list = []
|
|
|
|
def add_dir_to_list(dirlist, dir):
|
|
"""Add the directory 'dir' to the list 'dirlist' (at the front) if
|
|
1) 'dir' is not already in 'dirlist'
|
|
2) 'dir' actually exists, and is a directory."""
|
|
if dir is not None and os.path.isdir(dir) and dir not in dirlist:
|
|
dirlist.insert(0, dir)
|
|
|
|
def find_file(filename, std_dirs, paths):
|
|
"""Searches for the directory where a given file is located,
|
|
and returns a possibly-empty list of additional directories, or None
|
|
if the file couldn't be found at all.
|
|
|
|
'filename' is the name of a file, such as readline.h or libcrypto.a.
|
|
'std_dirs' is the list of standard system directories; if the
|
|
file is found in one of them, no additional directives are needed.
|
|
'paths' is a list of additional locations to check; if the file is
|
|
found in one of them, the resulting list will contain the directory.
|
|
"""
|
|
|
|
# Check the standard locations
|
|
for dir in std_dirs:
|
|
f = os.path.join(dir, filename)
|
|
if os.path.exists(f): return []
|
|
|
|
# Check the additional directories
|
|
for dir in paths:
|
|
f = os.path.join(dir, filename)
|
|
if os.path.exists(f):
|
|
return [dir]
|
|
|
|
# Not found anywhere
|
|
return None
|
|
|
|
def find_library_file(compiler, libname, std_dirs, paths):
|
|
result = compiler.find_library_file(std_dirs + paths, libname)
|
|
if result is None:
|
|
return None
|
|
|
|
# Check whether the found file is in one of the standard directories
|
|
dirname = os.path.dirname(result)
|
|
for p in std_dirs:
|
|
# Ensure path doesn't end with path separator
|
|
p = p.rstrip(os.sep)
|
|
if p == dirname:
|
|
return [ ]
|
|
|
|
# Otherwise, it must have been in one of the additional directories,
|
|
# so we have to figure out which one.
|
|
for p in paths:
|
|
# Ensure path doesn't end with path separator
|
|
p = p.rstrip(os.sep)
|
|
if p == dirname:
|
|
return [p]
|
|
else:
|
|
assert False, "Internal error: Path not found in std_dirs or paths"
|
|
|
|
def module_enabled(extlist, modname):
|
|
"""Returns whether the module 'modname' is present in the list
|
|
of extensions 'extlist'."""
|
|
extlist = [ext for ext in extlist if ext.name == modname]
|
|
return len(extlist)
|
|
|
|
def find_module_file(module, dirlist):
|
|
"""Find a module in a set of possible folders. If it is not found
|
|
return the unadorned filename"""
|
|
list = find_file(module, [], dirlist)
|
|
if not list:
|
|
return module
|
|
if len(list) > 1:
|
|
log.info("WARNING: multiple copies of %s found"%module)
|
|
return os.path.join(list[0], module)
|
|
|
|
class PyBuildExt(build_ext):
|
|
|
|
def build_extensions(self):
|
|
|
|
# Detect which modules should be compiled
|
|
self.detect_modules()
|
|
|
|
# Remove modules that are present on the disabled list
|
|
self.extensions = [ext for ext in self.extensions
|
|
if ext.name not in disabled_module_list]
|
|
|
|
# Fix up the autodetected modules, prefixing all the source files
|
|
# with Modules/ and adding Python's include directory to the path.
|
|
(srcdir,) = sysconfig.get_config_vars('srcdir')
|
|
if not srcdir:
|
|
# Maybe running on Windows but not using CYGWIN?
|
|
raise ValueError("No source directory; cannot proceed.")
|
|
|
|
# Figure out the location of the source code for extension modules
|
|
moddir = os.path.join(os.getcwd(), srcdir, 'Modules')
|
|
moddir = os.path.normpath(moddir)
|
|
srcdir, tail = os.path.split(moddir)
|
|
srcdir = os.path.normpath(srcdir)
|
|
moddir = os.path.normpath(moddir)
|
|
|
|
moddirlist = [moddir]
|
|
incdirlist = ['./Include']
|
|
|
|
# Platform-dependent module source and include directories
|
|
platform = self.get_platform()
|
|
if platform in ('darwin', 'mac') and ("--disable-toolbox-glue" not in
|
|
sysconfig.get_config_var("CONFIG_ARGS")):
|
|
# Mac OS X also includes some mac-specific modules
|
|
macmoddir = os.path.join(os.getcwd(), srcdir, 'Mac/Modules')
|
|
moddirlist.append(macmoddir)
|
|
incdirlist.append('./Mac/Include')
|
|
|
|
alldirlist = moddirlist + incdirlist
|
|
|
|
# Fix up the paths for scripts, too
|
|
self.distribution.scripts = [os.path.join(srcdir, filename)
|
|
for filename in self.distribution.scripts]
|
|
|
|
for ext in self.extensions[:]:
|
|
ext.sources = [ find_module_file(filename, moddirlist)
|
|
for filename in ext.sources ]
|
|
if ext.depends is not None:
|
|
ext.depends = [find_module_file(filename, alldirlist)
|
|
for filename in ext.depends]
|
|
ext.include_dirs.append( '.' ) # to get config.h
|
|
for incdir in incdirlist:
|
|
ext.include_dirs.append( os.path.join(srcdir, incdir) )
|
|
|
|
# If a module has already been built statically,
|
|
# don't build it here
|
|
if ext.name in sys.builtin_module_names:
|
|
self.extensions.remove(ext)
|
|
|
|
if platform != 'mac':
|
|
# Parse Modules/Setup and Modules/Setup.local to figure out which
|
|
# modules are turned on in the file.
|
|
remove_modules = []
|
|
for filename in ('Modules/Setup', 'Modules/Setup.local'):
|
|
input = text_file.TextFile(filename, join_lines=1)
|
|
while 1:
|
|
line = input.readline()
|
|
if not line: break
|
|
line = line.split()
|
|
remove_modules.append(line[0])
|
|
input.close()
|
|
|
|
for ext in self.extensions[:]:
|
|
if ext.name in remove_modules:
|
|
self.extensions.remove(ext)
|
|
|
|
# When you run "make CC=altcc" or something similar, you really want
|
|
# those environment variables passed into the setup.py phase. Here's
|
|
# a small set of useful ones.
|
|
compiler = os.environ.get('CC')
|
|
args = {}
|
|
# unfortunately, distutils doesn't let us provide separate C and C++
|
|
# compilers
|
|
if compiler is not None:
|
|
(ccshared,cflags) = sysconfig.get_config_vars('CCSHARED','CFLAGS')
|
|
args['compiler_so'] = compiler + ' ' + ccshared + ' ' + cflags
|
|
self.compiler.set_executables(**args)
|
|
|
|
build_ext.build_extensions(self)
|
|
|
|
def build_extension(self, ext):
|
|
|
|
if ext.name == '_ctypes':
|
|
if not self.configure_ctypes(ext):
|
|
return
|
|
|
|
try:
|
|
build_ext.build_extension(self, ext)
|
|
except (CCompilerError, DistutilsError), why:
|
|
self.announce('WARNING: building of extension "%s" failed: %s' %
|
|
(ext.name, sys.exc_info()[1]))
|
|
return
|
|
# Workaround for Mac OS X: The Carbon-based modules cannot be
|
|
# reliably imported into a command-line Python
|
|
if 'Carbon' in ext.extra_link_args:
|
|
self.announce(
|
|
'WARNING: skipping import check for Carbon-based "%s"' %
|
|
ext.name)
|
|
return
|
|
# Workaround for Cygwin: Cygwin currently has fork issues when many
|
|
# modules have been imported
|
|
if self.get_platform() == 'cygwin':
|
|
self.announce('WARNING: skipping import check for Cygwin-based "%s"'
|
|
% ext.name)
|
|
return
|
|
ext_filename = os.path.join(
|
|
self.build_lib,
|
|
self.get_ext_filename(self.get_ext_fullname(ext.name)))
|
|
try:
|
|
imp.load_dynamic(ext.name, ext_filename)
|
|
except ImportError, why:
|
|
self.announce('*** WARNING: renaming "%s" since importing it'
|
|
' failed: %s' % (ext.name, why), level=3)
|
|
assert not self.inplace
|
|
basename, tail = os.path.splitext(ext_filename)
|
|
newname = basename + "_failed" + tail
|
|
if os.path.exists(newname):
|
|
os.remove(newname)
|
|
os.rename(ext_filename, newname)
|
|
|
|
# XXX -- This relies on a Vile HACK in
|
|
# distutils.command.build_ext.build_extension(). The
|
|
# _built_objects attribute is stored there strictly for
|
|
# use here.
|
|
# If there is a failure, _built_objects may not be there,
|
|
# so catch the AttributeError and move on.
|
|
try:
|
|
for filename in self._built_objects:
|
|
os.remove(filename)
|
|
except AttributeError:
|
|
self.announce('unable to remove files (ignored)')
|
|
except:
|
|
exc_type, why, tb = sys.exc_info()
|
|
self.announce('*** WARNING: importing extension "%s" '
|
|
'failed with %s: %s' % (ext.name, exc_type, why),
|
|
level=3)
|
|
|
|
def get_platform(self):
|
|
# Get value of sys.platform
|
|
for platform in ['cygwin', 'beos', 'darwin', 'atheos', 'osf1']:
|
|
if sys.platform.startswith(platform):
|
|
return platform
|
|
return sys.platform
|
|
|
|
def detect_modules(self):
|
|
# Ensure that /usr/local is always used
|
|
add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib')
|
|
add_dir_to_list(self.compiler.include_dirs, '/usr/local/include')
|
|
|
|
# Add paths specified in the environment variables LDFLAGS and
|
|
# CPPFLAGS for header and library files.
|
|
# We must get the values from the Makefile and not the environment
|
|
# directly since an inconsistently reproducible issue comes up where
|
|
# the environment variable is not set even though the value were passed
|
|
# into configure and stored in the Makefile (issue found on OS X 10.3).
|
|
for env_var, arg_name, dir_list in (
|
|
('LDFLAGS', '-L', self.compiler.library_dirs),
|
|
('CPPFLAGS', '-I', self.compiler.include_dirs)):
|
|
env_val = sysconfig.get_config_var(env_var)
|
|
if env_val:
|
|
# To prevent optparse from raising an exception about any
|
|
# options in env_val that is doesn't know about we strip out
|
|
# all double dashes and any dashes followed by a character
|
|
# that is not for the option we are dealing with.
|
|
#
|
|
# Please note that order of the regex is important! We must
|
|
# strip out double-dashes first so that we don't end up with
|
|
# substituting "--Long" to "-Long" and thus lead to "ong" being
|
|
# used for a library directory.
|
|
env_val = re.sub(r'(^|\s+)-(-|(?!%s))' % arg_name[1], '', env_val)
|
|
parser = optparse.OptionParser()
|
|
# Make sure that allowing args interspersed with options is
|
|
# allowed
|
|
parser.allow_interspersed_args = True
|
|
parser.error = lambda msg: None
|
|
parser.add_option(arg_name, dest="dirs", action="append")
|
|
options = parser.parse_args(env_val.split())[0]
|
|
if options.dirs:
|
|
for directory in options.dirs:
|
|
add_dir_to_list(dir_list, directory)
|
|
|
|
if os.path.normpath(sys.prefix) != '/usr':
|
|
add_dir_to_list(self.compiler.library_dirs,
|
|
sysconfig.get_config_var("LIBDIR"))
|
|
add_dir_to_list(self.compiler.include_dirs,
|
|
sysconfig.get_config_var("INCLUDEDIR"))
|
|
|
|
try:
|
|
have_unicode = unicode
|
|
except NameError:
|
|
have_unicode = 0
|
|
|
|
# lib_dirs and inc_dirs are used to search for files;
|
|
# if a file is found in one of those directories, it can
|
|
# be assumed that no additional -I,-L directives are needed.
|
|
lib_dirs = self.compiler.library_dirs + [
|
|
'/lib64', '/usr/lib64',
|
|
'/lib', '/usr/lib',
|
|
]
|
|
inc_dirs = self.compiler.include_dirs + ['/usr/include']
|
|
exts = []
|
|
|
|
config_h = sysconfig.get_config_h_filename()
|
|
config_h_vars = sysconfig.parse_config_h(open(config_h))
|
|
|
|
platform = self.get_platform()
|
|
(srcdir,) = sysconfig.get_config_vars('srcdir')
|
|
|
|
# Check for AtheOS which has libraries in non-standard locations
|
|
if platform == 'atheos':
|
|
lib_dirs += ['/system/libs', '/atheos/autolnk/lib']
|
|
lib_dirs += os.getenv('LIBRARY_PATH', '').split(os.pathsep)
|
|
inc_dirs += ['/system/include', '/atheos/autolnk/include']
|
|
inc_dirs += os.getenv('C_INCLUDE_PATH', '').split(os.pathsep)
|
|
|
|
# OSF/1 and Unixware have some stuff in /usr/ccs/lib (like -ldb)
|
|
if platform in ['osf1', 'unixware7', 'openunix8']:
|
|
lib_dirs += ['/usr/ccs/lib']
|
|
|
|
if platform == 'darwin':
|
|
# This should work on any unixy platform ;-)
|
|
# If the user has bothered specifying additional -I and -L flags
|
|
# in OPT and LDFLAGS we might as well use them here.
|
|
# NOTE: using shlex.split would technically be more correct, but
|
|
# also gives a bootstrap problem. Let's hope nobody uses directories
|
|
# with whitespace in the name to store libraries.
|
|
cflags, ldflags = sysconfig.get_config_vars(
|
|
'CFLAGS', 'LDFLAGS')
|
|
for item in cflags.split():
|
|
if item.startswith('-I'):
|
|
inc_dirs.append(item[2:])
|
|
|
|
for item in ldflags.split():
|
|
if item.startswith('-L'):
|
|
lib_dirs.append(item[2:])
|
|
|
|
# Check for MacOS X, which doesn't need libm.a at all
|
|
math_libs = ['m']
|
|
if platform in ['darwin', 'beos', 'mac']:
|
|
math_libs = []
|
|
|
|
# XXX Omitted modules: gl, pure, dl, SGI-specific modules
|
|
|
|
#
|
|
# The following modules are all pretty straightforward, and compile
|
|
# on pretty much any POSIXish platform.
|
|
#
|
|
|
|
# Some modules that are normally always on:
|
|
exts.append( Extension('_weakref', ['_weakref.c']) )
|
|
|
|
# array objects
|
|
exts.append( Extension('array', ['arraymodule.c']) )
|
|
# complex math library functions
|
|
exts.append( Extension('cmath', ['cmathmodule.c'],
|
|
libraries=math_libs) )
|
|
|
|
# math library functions, e.g. sin()
|
|
exts.append( Extension('math', ['mathmodule.c'],
|
|
libraries=math_libs) )
|
|
# fast string operations implemented in C
|
|
exts.append( Extension('strop', ['stropmodule.c']) )
|
|
# time operations and variables
|
|
exts.append( Extension('time', ['timemodule.c'],
|
|
libraries=math_libs) )
|
|
exts.append( Extension('datetime', ['datetimemodule.c', 'timemodule.c'],
|
|
libraries=math_libs) )
|
|
# random number generator implemented in C
|
|
exts.append( Extension("_random", ["_randommodule.c"]) )
|
|
# fast iterator tools implemented in C
|
|
exts.append( Extension("itertools", ["itertoolsmodule.c"]) )
|
|
# high-performance collections
|
|
exts.append( Extension("collections", ["collectionsmodule.c"]) )
|
|
# bisect
|
|
exts.append( Extension("_bisect", ["_bisectmodule.c"]) )
|
|
# heapq
|
|
exts.append( Extension("_heapq", ["_heapqmodule.c"]) )
|
|
# operator.add() and similar goodies
|
|
exts.append( Extension('operator', ['operator.c']) )
|
|
# _functools
|
|
exts.append( Extension("_functools", ["_functoolsmodule.c"]) )
|
|
# Python C API test module
|
|
exts.append( Extension('_testcapi', ['_testcapimodule.c']) )
|
|
# profilers (_lsprof is for cProfile.py)
|
|
exts.append( Extension('_hotshot', ['_hotshot.c']) )
|
|
exts.append( Extension('_lsprof', ['_lsprof.c', 'rotatingtree.c']) )
|
|
# static Unicode character database
|
|
if have_unicode:
|
|
exts.append( Extension('unicodedata', ['unicodedata.c']) )
|
|
# access to ISO C locale support
|
|
data = open('pyconfig.h').read()
|
|
m = re.search(r"#s*define\s+WITH_LIBINTL\s+1\s*", data)
|
|
if m is not None:
|
|
locale_libs = ['intl']
|
|
else:
|
|
locale_libs = []
|
|
if platform == 'darwin':
|
|
locale_extra_link_args = ['-framework', 'CoreFoundation']
|
|
else:
|
|
locale_extra_link_args = []
|
|
|
|
|
|
exts.append( Extension('_locale', ['_localemodule.c'],
|
|
libraries=locale_libs,
|
|
extra_link_args=locale_extra_link_args) )
|
|
|
|
# Modules with some UNIX dependencies -- on by default:
|
|
# (If you have a really backward UNIX, select and socket may not be
|
|
# supported...)
|
|
|
|
# fcntl(2) and ioctl(2)
|
|
exts.append( Extension('fcntl', ['fcntlmodule.c']) )
|
|
if platform not in ['mac']:
|
|
# pwd(3)
|
|
exts.append( Extension('pwd', ['pwdmodule.c']) )
|
|
# grp(3)
|
|
exts.append( Extension('grp', ['grpmodule.c']) )
|
|
# spwd, shadow passwords
|
|
if (config_h_vars.get('HAVE_GETSPNAM', False) or
|
|
config_h_vars.get('HAVE_GETSPENT', False)):
|
|
exts.append( Extension('spwd', ['spwdmodule.c']) )
|
|
# select(2); not on ancient System V
|
|
exts.append( Extension('select', ['selectmodule.c']) )
|
|
|
|
# Helper module for various ascii-encoders
|
|
exts.append( Extension('binascii', ['binascii.c']) )
|
|
|
|
# Fred Drake's interface to the Python parser
|
|
exts.append( Extension('parser', ['parsermodule.c']) )
|
|
|
|
# cStringIO and cPickle
|
|
exts.append( Extension('cStringIO', ['cStringIO.c']) )
|
|
exts.append( Extension('cPickle', ['cPickle.c']) )
|
|
|
|
# Memory-mapped files (also works on Win32).
|
|
if platform not in ['atheos', 'mac']:
|
|
exts.append( Extension('mmap', ['mmapmodule.c']) )
|
|
|
|
# Lance Ellinghaus's syslog module
|
|
if platform not in ['mac']:
|
|
# syslog daemon interface
|
|
exts.append( Extension('syslog', ['syslogmodule.c']) )
|
|
|
|
# George Neville-Neil's timing module:
|
|
# Deprecated in PEP 4 http://www.python.org/peps/pep-0004.html
|
|
# http://mail.python.org/pipermail/python-dev/2006-January/060023.html
|
|
#exts.append( Extension('timing', ['timingmodule.c']) )
|
|
|
|
#
|
|
# Here ends the simple stuff. From here on, modules need certain
|
|
# libraries, are platform-specific, or present other surprises.
|
|
#
|
|
|
|
# Multimedia modules
|
|
# These don't work for 64-bit platforms!!!
|
|
# These represent audio samples or images as strings:
|
|
|
|
# Operations on audio samples
|
|
# According to #993173, this one should actually work fine on
|
|
# 64-bit platforms.
|
|
exts.append( Extension('audioop', ['audioop.c']) )
|
|
|
|
# Disabled on 64-bit platforms
|
|
if sys.maxint != 9223372036854775807L:
|
|
# Operations on images
|
|
exts.append( Extension('imageop', ['imageop.c']) )
|
|
# Read SGI RGB image files (but coded portably)
|
|
exts.append( Extension('rgbimg', ['rgbimgmodule.c']) )
|
|
|
|
# readline
|
|
do_readline = self.compiler.find_library_file(lib_dirs, 'readline')
|
|
if platform == 'darwin':
|
|
# MacOSX 10.4 has a broken readline. Don't try to build
|
|
# the readline module unless the user has installed a fixed
|
|
# readline package
|
|
if find_file('readline/rlconf.h', inc_dirs, []) is None:
|
|
do_readline = False
|
|
if do_readline:
|
|
if sys.platform == 'darwin':
|
|
# In every directory on the search path search for a dynamic
|
|
# library and then a static library, instead of first looking
|
|
# for dynamic libraries on the entiry path.
|
|
# This way a staticly linked custom readline gets picked up
|
|
# before the (broken) dynamic library in /usr/lib.
|
|
readline_extra_link_args = ('-Wl,-search_paths_first',)
|
|
else:
|
|
readline_extra_link_args = ()
|
|
|
|
readline_libs = ['readline']
|
|
if self.compiler.find_library_file(lib_dirs,
|
|
'ncursesw'):
|
|
readline_libs.append('ncursesw')
|
|
elif self.compiler.find_library_file(lib_dirs,
|
|
'ncurses'):
|
|
readline_libs.append('ncurses')
|
|
elif self.compiler.find_library_file(lib_dirs, 'curses'):
|
|
readline_libs.append('curses')
|
|
elif self.compiler.find_library_file(lib_dirs +
|
|
['/usr/lib/termcap'],
|
|
'termcap'):
|
|
readline_libs.append('termcap')
|
|
exts.append( Extension('readline', ['readline.c'],
|
|
library_dirs=['/usr/lib/termcap'],
|
|
extra_link_args=readline_extra_link_args,
|
|
libraries=readline_libs) )
|
|
if platform not in ['mac']:
|
|
# crypt module.
|
|
|
|
if self.compiler.find_library_file(lib_dirs, 'crypt'):
|
|
libs = ['crypt']
|
|
else:
|
|
libs = []
|
|
exts.append( Extension('crypt', ['cryptmodule.c'], libraries=libs) )
|
|
|
|
# CSV files
|
|
exts.append( Extension('_csv', ['_csv.c']) )
|
|
|
|
# socket(2)
|
|
exts.append( Extension('_socket', ['socketmodule.c'],
|
|
depends = ['socketmodule.h']) )
|
|
# Detect SSL support for the socket module (via _ssl)
|
|
search_for_ssl_incs_in = [
|
|
'/usr/local/ssl/include',
|
|
'/usr/contrib/ssl/include/'
|
|
]
|
|
ssl_incs = find_file('openssl/ssl.h', inc_dirs,
|
|
search_for_ssl_incs_in
|
|
)
|
|
if ssl_incs is not None:
|
|
krb5_h = find_file('krb5.h', inc_dirs,
|
|
['/usr/kerberos/include'])
|
|
if krb5_h:
|
|
ssl_incs += krb5_h
|
|
ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
|
|
['/usr/local/ssl/lib',
|
|
'/usr/contrib/ssl/lib/'
|
|
] )
|
|
|
|
if (ssl_incs is not None and
|
|
ssl_libs is not None):
|
|
exts.append( Extension('_ssl', ['_ssl.c'],
|
|
include_dirs = ssl_incs,
|
|
library_dirs = ssl_libs,
|
|
libraries = ['ssl', 'crypto'],
|
|
depends = ['socketmodule.h']), )
|
|
|
|
# find out which version of OpenSSL we have
|
|
openssl_ver = 0
|
|
openssl_ver_re = re.compile(
|
|
'^\s*#\s*define\s+OPENSSL_VERSION_NUMBER\s+(0x[0-9a-fA-F]+)' )
|
|
for ssl_inc_dir in inc_dirs + search_for_ssl_incs_in:
|
|
name = os.path.join(ssl_inc_dir, 'openssl', 'opensslv.h')
|
|
if os.path.isfile(name):
|
|
try:
|
|
incfile = open(name, 'r')
|
|
for line in incfile:
|
|
m = openssl_ver_re.match(line)
|
|
if m:
|
|
openssl_ver = eval(m.group(1))
|
|
break
|
|
except IOError:
|
|
pass
|
|
|
|
# first version found is what we'll use (as the compiler should)
|
|
if openssl_ver:
|
|
break
|
|
|
|
#print 'openssl_ver = 0x%08x' % openssl_ver
|
|
|
|
if (ssl_incs is not None and
|
|
ssl_libs is not None and
|
|
openssl_ver >= 0x00907000):
|
|
# The _hashlib module wraps optimized implementations
|
|
# of hash functions from the OpenSSL library.
|
|
exts.append( Extension('_hashlib', ['_hashopenssl.c'],
|
|
include_dirs = ssl_incs,
|
|
library_dirs = ssl_libs,
|
|
libraries = ['ssl', 'crypto']) )
|
|
else:
|
|
# The _sha module implements the SHA1 hash algorithm.
|
|
exts.append( Extension('_sha', ['shamodule.c']) )
|
|
# The _md5 module implements the RSA Data Security, Inc. MD5
|
|
# Message-Digest Algorithm, described in RFC 1321. The
|
|
# necessary files md5.c and md5.h are included here.
|
|
exts.append( Extension('_md5',
|
|
sources = ['md5module.c', 'md5.c'],
|
|
depends = ['md5.h']) )
|
|
|
|
if (openssl_ver < 0x00908000):
|
|
# OpenSSL doesn't do these until 0.9.8 so we'll bring our own hash
|
|
exts.append( Extension('_sha256', ['sha256module.c']) )
|
|
exts.append( Extension('_sha512', ['sha512module.c']) )
|
|
|
|
|
|
# Modules that provide persistent dictionary-like semantics. You will
|
|
# probably want to arrange for at least one of them to be available on
|
|
# your machine, though none are defined by default because of library
|
|
# dependencies. The Python module anydbm.py provides an
|
|
# implementation independent wrapper for these; dumbdbm.py provides
|
|
# similar functionality (but slower of course) implemented in Python.
|
|
|
|
# Sleepycat Berkeley DB interface. http://www.sleepycat.com
|
|
#
|
|
# This requires the Sleepycat DB code. The supported versions
|
|
# are set below. Visit http://www.sleepycat.com/ to download
|
|
# a release. Most open source OSes come with one or more
|
|
# versions of BerkeleyDB already installed.
|
|
|
|
max_db_ver = (4, 4)
|
|
min_db_ver = (3, 3)
|
|
db_setup_debug = False # verbose debug prints from this script?
|
|
|
|
# construct a list of paths to look for the header file in on
|
|
# top of the normal inc_dirs.
|
|
db_inc_paths = [
|
|
'/usr/include/db4',
|
|
'/usr/local/include/db4',
|
|
'/opt/sfw/include/db4',
|
|
'/sw/include/db4',
|
|
'/usr/include/db3',
|
|
'/usr/local/include/db3',
|
|
'/opt/sfw/include/db3',
|
|
'/sw/include/db3',
|
|
]
|
|
# 4.x minor number specific paths
|
|
for x in (0,1,2,3,4):
|
|
db_inc_paths.append('/usr/include/db4%d' % x)
|
|
db_inc_paths.append('/usr/include/db4.%d' % x)
|
|
db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x)
|
|
db_inc_paths.append('/usr/local/include/db4%d' % x)
|
|
db_inc_paths.append('/pkg/db-4.%d/include' % x)
|
|
db_inc_paths.append('/opt/db-4.%d/include' % x)
|
|
# 3.x minor number specific paths
|
|
for x in (2,3):
|
|
db_inc_paths.append('/usr/include/db3%d' % x)
|
|
db_inc_paths.append('/usr/local/BerkeleyDB.3.%d/include' % x)
|
|
db_inc_paths.append('/usr/local/include/db3%d' % x)
|
|
db_inc_paths.append('/pkg/db-3.%d/include' % x)
|
|
db_inc_paths.append('/opt/db-3.%d/include' % x)
|
|
|
|
# Add some common subdirectories for Sleepycat DB to the list,
|
|
# based on the standard include directories. This way DB3/4 gets
|
|
# picked up when it is installed in a non-standard prefix and
|
|
# the user has added that prefix into inc_dirs.
|
|
std_variants = []
|
|
for dn in inc_dirs:
|
|
std_variants.append(os.path.join(dn, 'db3'))
|
|
std_variants.append(os.path.join(dn, 'db4'))
|
|
for x in (0,1,2,3,4):
|
|
std_variants.append(os.path.join(dn, "db4%d"%x))
|
|
std_variants.append(os.path.join(dn, "db4.%d"%x))
|
|
for x in (2,3):
|
|
std_variants.append(os.path.join(dn, "db3%d"%x))
|
|
std_variants.append(os.path.join(dn, "db3.%d"%x))
|
|
|
|
db_inc_paths = std_variants + db_inc_paths
|
|
|
|
|
|
db_ver_inc_map = {}
|
|
|
|
class db_found(Exception): pass
|
|
try:
|
|
# See whether there is a Sleepycat header in the standard
|
|
# search path.
|
|
for d in inc_dirs + db_inc_paths:
|
|
f = os.path.join(d, "db.h")
|
|
if db_setup_debug: print "db: looking for db.h in", f
|
|
if os.path.exists(f):
|
|
f = open(f).read()
|
|
m = re.search(r"#define\WDB_VERSION_MAJOR\W(\d+)", f)
|
|
if m:
|
|
db_major = int(m.group(1))
|
|
m = re.search(r"#define\WDB_VERSION_MINOR\W(\d+)", f)
|
|
db_minor = int(m.group(1))
|
|
db_ver = (db_major, db_minor)
|
|
|
|
if ( (db_ver not in db_ver_inc_map) and
|
|
(db_ver <= max_db_ver and db_ver >= min_db_ver) ):
|
|
# save the include directory with the db.h version
|
|
# (first occurrance only)
|
|
db_ver_inc_map[db_ver] = d
|
|
if db_setup_debug:
|
|
print "db.h: found", db_ver, "in", d
|
|
else:
|
|
# we already found a header for this library version
|
|
if db_setup_debug: print "db.h: ignoring", d
|
|
else:
|
|
# ignore this header, it didn't contain a version number
|
|
if db_setup_debug: print "db.h: unsupported version", db_ver, "in", d
|
|
|
|
db_found_vers = db_ver_inc_map.keys()
|
|
db_found_vers.sort()
|
|
|
|
while db_found_vers:
|
|
db_ver = db_found_vers.pop()
|
|
db_incdir = db_ver_inc_map[db_ver]
|
|
|
|
# check lib directories parallel to the location of the header
|
|
db_dirs_to_check = [
|
|
os.path.join(db_incdir, '..', 'lib64'),
|
|
os.path.join(db_incdir, '..', 'lib'),
|
|
os.path.join(db_incdir, '..', '..', 'lib64'),
|
|
os.path.join(db_incdir, '..', '..', 'lib'),
|
|
]
|
|
db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
|
|
|
|
# Look for a version specific db-X.Y before an ambiguoius dbX
|
|
# XXX should we -ever- look for a dbX name? Do any
|
|
# systems really not name their library by version and
|
|
# symlink to more general names?
|
|
for dblib in (('db-%d.%d' % db_ver),
|
|
('db%d%d' % db_ver),
|
|
('db%d' % db_ver[0])):
|
|
dblib_file = self.compiler.find_library_file(
|
|
db_dirs_to_check + lib_dirs, dblib )
|
|
if dblib_file:
|
|
dblib_dir = [ os.path.abspath(os.path.dirname(dblib_file)) ]
|
|
raise db_found
|
|
else:
|
|
if db_setup_debug: print "db lib: ", dblib, "not found"
|
|
|
|
except db_found:
|
|
if db_setup_debug:
|
|
print "db lib: using", db_ver, dblib
|
|
print "db: lib dir", dblib_dir, "inc dir", db_incdir
|
|
db_incs = [db_incdir]
|
|
dblibs = [dblib]
|
|
# We add the runtime_library_dirs argument because the
|
|
# BerkeleyDB lib we're linking against often isn't in the
|
|
# system dynamic library search path. This is usually
|
|
# correct and most trouble free, but may cause problems in
|
|
# some unusual system configurations (e.g. the directory
|
|
# is on an NFS server that goes away).
|
|
exts.append(Extension('_bsddb', ['_bsddb.c'],
|
|
library_dirs=dblib_dir,
|
|
runtime_library_dirs=dblib_dir,
|
|
include_dirs=db_incs,
|
|
libraries=dblibs))
|
|
else:
|
|
if db_setup_debug: print "db: no appropriate library found"
|
|
db_incs = None
|
|
dblibs = []
|
|
dblib_dir = None
|
|
|
|
# The sqlite interface
|
|
sqlite_setup_debug = False # verbose debug prints from this script?
|
|
|
|
# We hunt for #define SQLITE_VERSION "n.n.n"
|
|
# We need to find >= sqlite version 3.0.8
|
|
sqlite_incdir = sqlite_libdir = None
|
|
sqlite_inc_paths = [ '/usr/include',
|
|
'/usr/include/sqlite',
|
|
'/usr/include/sqlite3',
|
|
'/usr/local/include',
|
|
'/usr/local/include/sqlite',
|
|
'/usr/local/include/sqlite3',
|
|
]
|
|
MIN_SQLITE_VERSION_NUMBER = (3, 0, 8)
|
|
MIN_SQLITE_VERSION = ".".join([str(x)
|
|
for x in MIN_SQLITE_VERSION_NUMBER])
|
|
|
|
# Scan the default include directories before the SQLite specific
|
|
# ones. This allows one to override the copy of sqlite on OSX,
|
|
# where /usr/include contains an old version of sqlite.
|
|
for d in inc_dirs + sqlite_inc_paths:
|
|
f = os.path.join(d, "sqlite3.h")
|
|
if os.path.exists(f):
|
|
if sqlite_setup_debug: print "sqlite: found %s"%f
|
|
incf = open(f).read()
|
|
m = re.search(
|
|
r'\s*.*#\s*.*define\s.*SQLITE_VERSION\W*"(.*)"', incf)
|
|
if m:
|
|
sqlite_version = m.group(1)
|
|
sqlite_version_tuple = tuple([int(x)
|
|
for x in sqlite_version.split(".")])
|
|
if sqlite_version_tuple >= MIN_SQLITE_VERSION_NUMBER:
|
|
# we win!
|
|
if sqlite_setup_debug:
|
|
print "%s/sqlite3.h: version %s"%(d, sqlite_version)
|
|
sqlite_incdir = d
|
|
break
|
|
else:
|
|
if sqlite_setup_debug:
|
|
print "%s: version %d is too old, need >= %s"%(d,
|
|
sqlite_version, MIN_SQLITE_VERSION)
|
|
elif sqlite_setup_debug:
|
|
print "sqlite: %s had no SQLITE_VERSION"%(f,)
|
|
|
|
if sqlite_incdir:
|
|
sqlite_dirs_to_check = [
|
|
os.path.join(sqlite_incdir, '..', 'lib64'),
|
|
os.path.join(sqlite_incdir, '..', 'lib'),
|
|
os.path.join(sqlite_incdir, '..', '..', 'lib64'),
|
|
os.path.join(sqlite_incdir, '..', '..', 'lib'),
|
|
]
|
|
sqlite_libfile = self.compiler.find_library_file(
|
|
sqlite_dirs_to_check + lib_dirs, 'sqlite3')
|
|
sqlite_libdir = [os.path.abspath(os.path.dirname(sqlite_libfile))]
|
|
|
|
if sqlite_incdir and sqlite_libdir:
|
|
sqlite_srcs = ['_sqlite/cache.c',
|
|
'_sqlite/connection.c',
|
|
'_sqlite/cursor.c',
|
|
'_sqlite/microprotocols.c',
|
|
'_sqlite/module.c',
|
|
'_sqlite/prepare_protocol.c',
|
|
'_sqlite/row.c',
|
|
'_sqlite/statement.c',
|
|
'_sqlite/util.c', ]
|
|
|
|
sqlite_defines = []
|
|
if sys.platform != "win32":
|
|
sqlite_defines.append(('MODULE_NAME', '"sqlite3"'))
|
|
else:
|
|
sqlite_defines.append(('MODULE_NAME', '\\"sqlite3\\"'))
|
|
|
|
|
|
if sys.platform == 'darwin':
|
|
# In every directory on the search path search for a dynamic
|
|
# library and then a static library, instead of first looking
|
|
# for dynamic libraries on the entiry path.
|
|
# This way a staticly linked custom sqlite gets picked up
|
|
# before the dynamic library in /usr/lib.
|
|
sqlite_extra_link_args = ('-Wl,-search_paths_first',)
|
|
else:
|
|
sqlite_extra_link_args = ()
|
|
|
|
exts.append(Extension('_sqlite3', sqlite_srcs,
|
|
define_macros=sqlite_defines,
|
|
include_dirs=["Modules/_sqlite",
|
|
sqlite_incdir],
|
|
library_dirs=sqlite_libdir,
|
|
runtime_library_dirs=sqlite_libdir,
|
|
extra_link_args=sqlite_extra_link_args,
|
|
libraries=["sqlite3",]))
|
|
|
|
# Look for Berkeley db 1.85. Note that it is built as a different
|
|
# module name so it can be included even when later versions are
|
|
# available. A very restrictive search is performed to avoid
|
|
# accidentally building this module with a later version of the
|
|
# underlying db library. May BSD-ish Unixes incorporate db 1.85
|
|
# symbols into libc and place the include file in /usr/include.
|
|
f = "/usr/include/db.h"
|
|
if os.path.exists(f):
|
|
data = open(f).read()
|
|
m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
|
|
if m is not None:
|
|
# bingo - old version used hash file format version 2
|
|
### XXX this should be fixed to not be platform-dependent
|
|
### but I don't have direct access to an osf1 platform and
|
|
### seemed to be muffing the search somehow
|
|
libraries = platform == "osf1" and ['db'] or None
|
|
if libraries is not None:
|
|
exts.append(Extension('bsddb185', ['bsddbmodule.c'],
|
|
libraries=libraries))
|
|
else:
|
|
exts.append(Extension('bsddb185', ['bsddbmodule.c']))
|
|
|
|
# The standard Unix dbm module:
|
|
if platform not in ['cygwin']:
|
|
if find_file("ndbm.h", inc_dirs, []) is not None:
|
|
# Some systems have -lndbm, others don't
|
|
if self.compiler.find_library_file(lib_dirs, 'ndbm'):
|
|
ndbm_libs = ['ndbm']
|
|
else:
|
|
ndbm_libs = []
|
|
exts.append( Extension('dbm', ['dbmmodule.c'],
|
|
define_macros=[('HAVE_NDBM_H',None)],
|
|
libraries = ndbm_libs ) )
|
|
elif (self.compiler.find_library_file(lib_dirs, 'gdbm')
|
|
and find_file("gdbm/ndbm.h", inc_dirs, []) is not None):
|
|
exts.append( Extension('dbm', ['dbmmodule.c'],
|
|
define_macros=[('HAVE_GDBM_NDBM_H',None)],
|
|
libraries = ['gdbm'] ) )
|
|
elif db_incs is not None:
|
|
exts.append( Extension('dbm', ['dbmmodule.c'],
|
|
library_dirs=dblib_dir,
|
|
runtime_library_dirs=dblib_dir,
|
|
include_dirs=db_incs,
|
|
define_macros=[('HAVE_BERKDB_H',None),
|
|
('DB_DBM_HSEARCH',None)],
|
|
libraries=dblibs))
|
|
|
|
# Anthony Baxter's gdbm module. GNU dbm(3) will require -lgdbm:
|
|
if (self.compiler.find_library_file(lib_dirs, 'gdbm')):
|
|
exts.append( Extension('gdbm', ['gdbmmodule.c'],
|
|
libraries = ['gdbm'] ) )
|
|
|
|
# Unix-only modules
|
|
if platform not in ['mac', 'win32']:
|
|
# Steen Lumholt's termios module
|
|
exts.append( Extension('termios', ['termios.c']) )
|
|
# Jeremy Hylton's rlimit interface
|
|
if platform not in ['atheos']:
|
|
exts.append( Extension('resource', ['resource.c']) )
|
|
|
|
# Sun yellow pages. Some systems have the functions in libc.
|
|
if platform not in ['cygwin', 'atheos']:
|
|
if (self.compiler.find_library_file(lib_dirs, 'nsl')):
|
|
libs = ['nsl']
|
|
else:
|
|
libs = []
|
|
exts.append( Extension('nis', ['nismodule.c'],
|
|
libraries = libs) )
|
|
|
|
# Curses support, requiring the System V version of curses, often
|
|
# provided by the ncurses library.
|
|
panel_library = 'panel'
|
|
if (self.compiler.find_library_file(lib_dirs, 'ncursesw')):
|
|
curses_libs = ['ncursesw']
|
|
# Bug 1464056: If _curses.so links with ncursesw,
|
|
# _curses_panel.so must link with panelw.
|
|
panel_library = 'panelw'
|
|
exts.append( Extension('_curses', ['_cursesmodule.c'],
|
|
libraries = curses_libs) )
|
|
elif (self.compiler.find_library_file(lib_dirs, 'ncurses')):
|
|
curses_libs = ['ncurses']
|
|
exts.append( Extension('_curses', ['_cursesmodule.c'],
|
|
libraries = curses_libs) )
|
|
elif (self.compiler.find_library_file(lib_dirs, 'curses')
|
|
and platform != 'darwin'):
|
|
# OSX has an old Berkeley curses, not good enough for
|
|
# the _curses module.
|
|
if (self.compiler.find_library_file(lib_dirs, 'terminfo')):
|
|
curses_libs = ['curses', 'terminfo']
|
|
elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
|
|
curses_libs = ['curses', 'termcap']
|
|
else:
|
|
curses_libs = ['curses']
|
|
|
|
exts.append( Extension('_curses', ['_cursesmodule.c'],
|
|
libraries = curses_libs) )
|
|
|
|
# If the curses module is enabled, check for the panel module
|
|
if (module_enabled(exts, '_curses') and
|
|
self.compiler.find_library_file(lib_dirs, panel_library)):
|
|
exts.append( Extension('_curses_panel', ['_curses_panel.c'],
|
|
libraries = [panel_library] + curses_libs) )
|
|
|
|
|
|
# Andrew Kuchling's zlib module. Note that some versions of zlib
|
|
# 1.1.3 have security problems. See CERT Advisory CA-2002-07:
|
|
# http://www.cert.org/advisories/CA-2002-07.html
|
|
#
|
|
# zlib 1.1.4 is fixed, but at least one vendor (RedHat) has decided to
|
|
# patch its zlib 1.1.3 package instead of upgrading to 1.1.4. For
|
|
# now, we still accept 1.1.3, because we think it's difficult to
|
|
# exploit this in Python, and we'd rather make it RedHat's problem
|
|
# than our problem <wink>.
|
|
#
|
|
# You can upgrade zlib to version 1.1.4 yourself by going to
|
|
# http://www.gzip.org/zlib/
|
|
zlib_inc = find_file('zlib.h', [], inc_dirs)
|
|
if zlib_inc is not None:
|
|
zlib_h = zlib_inc[0] + '/zlib.h'
|
|
version = '"0.0.0"'
|
|
version_req = '"1.1.3"'
|
|
fp = open(zlib_h)
|
|
while 1:
|
|
line = fp.readline()
|
|
if not line:
|
|
break
|
|
if line.startswith('#define ZLIB_VERSION'):
|
|
version = line.split()[2]
|
|
break
|
|
if version >= version_req:
|
|
if (self.compiler.find_library_file(lib_dirs, 'z')):
|
|
if sys.platform == "darwin":
|
|
zlib_extra_link_args = ('-Wl,-search_paths_first',)
|
|
else:
|
|
zlib_extra_link_args = ()
|
|
exts.append( Extension('zlib', ['zlibmodule.c'],
|
|
libraries = ['z'],
|
|
extra_link_args = zlib_extra_link_args))
|
|
|
|
# Gustavo Niemeyer's bz2 module.
|
|
if (self.compiler.find_library_file(lib_dirs, 'bz2')):
|
|
if sys.platform == "darwin":
|
|
bz2_extra_link_args = ('-Wl,-search_paths_first',)
|
|
else:
|
|
bz2_extra_link_args = ()
|
|
exts.append( Extension('bz2', ['bz2module.c'],
|
|
libraries = ['bz2'],
|
|
extra_link_args = bz2_extra_link_args) )
|
|
|
|
# Interface to the Expat XML parser
|
|
#
|
|
# Expat was written by James Clark and is now maintained by a
|
|
# group of developers on SourceForge; see www.libexpat.org for
|
|
# more information. The pyexpat module was written by Paul
|
|
# Prescod after a prototype by Jack Jansen. The Expat source
|
|
# is included in Modules/expat/. Usage of a system
|
|
# shared libexpat.so/expat.dll is not advised.
|
|
#
|
|
# More information on Expat can be found at www.libexpat.org.
|
|
#
|
|
expatinc = os.path.join(os.getcwd(), srcdir, 'Modules', 'expat')
|
|
define_macros = [
|
|
('HAVE_EXPAT_CONFIG_H', '1'),
|
|
]
|
|
|
|
exts.append(Extension('pyexpat',
|
|
define_macros = define_macros,
|
|
include_dirs = [expatinc],
|
|
sources = ['pyexpat.c',
|
|
'expat/xmlparse.c',
|
|
'expat/xmlrole.c',
|
|
'expat/xmltok.c',
|
|
],
|
|
))
|
|
|
|
# Fredrik Lundh's cElementTree module. Note that this also
|
|
# uses expat (via the CAPI hook in pyexpat).
|
|
|
|
if os.path.isfile(os.path.join(srcdir, 'Modules', '_elementtree.c')):
|
|
define_macros.append(('USE_PYEXPAT_CAPI', None))
|
|
exts.append(Extension('_elementtree',
|
|
define_macros = define_macros,
|
|
include_dirs = [expatinc],
|
|
sources = ['_elementtree.c'],
|
|
))
|
|
|
|
# Hye-Shik Chang's CJKCodecs modules.
|
|
if have_unicode:
|
|
exts.append(Extension('_multibytecodec',
|
|
['cjkcodecs/multibytecodec.c']))
|
|
for loc in ('kr', 'jp', 'cn', 'tw', 'hk', 'iso2022'):
|
|
exts.append(Extension('_codecs_' + loc,
|
|
['cjkcodecs/_codecs_%s.c' % loc]))
|
|
|
|
# Dynamic loading module
|
|
if sys.maxint == 0x7fffffff:
|
|
# This requires sizeof(int) == sizeof(long) == sizeof(char*)
|
|
dl_inc = find_file('dlfcn.h', [], inc_dirs)
|
|
if (dl_inc is not None) and (platform not in ['atheos']):
|
|
exts.append( Extension('dl', ['dlmodule.c']) )
|
|
|
|
# Thomas Heller's _ctypes module
|
|
self.detect_ctypes(inc_dirs, lib_dirs)
|
|
|
|
# Platform-specific libraries
|
|
if platform == 'linux2':
|
|
# Linux-specific modules
|
|
exts.append( Extension('linuxaudiodev', ['linuxaudiodev.c']) )
|
|
|
|
if platform in ('linux2', 'freebsd4', 'freebsd5', 'freebsd6',
|
|
'freebsd7'):
|
|
exts.append( Extension('ossaudiodev', ['ossaudiodev.c']) )
|
|
|
|
if platform == 'sunos5':
|
|
# SunOS specific modules
|
|
exts.append( Extension('sunaudiodev', ['sunaudiodev.c']) )
|
|
|
|
if platform == 'darwin' and ("--disable-toolbox-glue" not in
|
|
sysconfig.get_config_var("CONFIG_ARGS")):
|
|
|
|
if os.uname()[2] > '8.':
|
|
# We're on Mac OS X 10.4 or later, the compiler should
|
|
# support '-Wno-deprecated-declarations'. This will
|
|
# surpress deprecation warnings for the Carbon extensions,
|
|
# these extensions wrap the Carbon APIs and even those
|
|
# parts that are deprecated.
|
|
carbon_extra_compile_args = ['-Wno-deprecated-declarations']
|
|
else:
|
|
carbon_extra_compile_args = []
|
|
|
|
# Mac OS X specific modules.
|
|
def macSrcExists(name1, name2=''):
|
|
if not name1:
|
|
return None
|
|
names = (name1,)
|
|
if name2:
|
|
names = (name1, name2)
|
|
path = os.path.join(srcdir, 'Mac', 'Modules', *names)
|
|
return os.path.exists(path)
|
|
|
|
def addMacExtension(name, kwds, extra_srcs=[]):
|
|
dirname = ''
|
|
if name[0] == '_':
|
|
dirname = name[1:].lower()
|
|
cname = name + '.c'
|
|
cmodulename = name + 'module.c'
|
|
# Check for NNN.c, NNNmodule.c, _nnn/NNN.c, _nnn/NNNmodule.c
|
|
if macSrcExists(cname):
|
|
srcs = [cname]
|
|
elif macSrcExists(cmodulename):
|
|
srcs = [cmodulename]
|
|
elif macSrcExists(dirname, cname):
|
|
# XXX(nnorwitz): If all the names ended with module, we
|
|
# wouldn't need this condition. ibcarbon is the only one.
|
|
srcs = [os.path.join(dirname, cname)]
|
|
elif macSrcExists(dirname, cmodulename):
|
|
srcs = [os.path.join(dirname, cmodulename)]
|
|
else:
|
|
raise RuntimeError("%s not found" % name)
|
|
|
|
# Here's the whole point: add the extension with sources
|
|
exts.append(Extension(name, srcs + extra_srcs, **kwds))
|
|
|
|
# Core Foundation
|
|
core_kwds = {'extra_compile_args': carbon_extra_compile_args,
|
|
'extra_link_args': ['-framework', 'CoreFoundation'],
|
|
}
|
|
addMacExtension('_CF', core_kwds, ['cf/pycfbridge.c'])
|
|
addMacExtension('autoGIL', core_kwds)
|
|
|
|
# Carbon
|
|
carbon_kwds = {'extra_compile_args': carbon_extra_compile_args,
|
|
'extra_link_args': ['-framework', 'Carbon'],
|
|
}
|
|
CARBON_EXTS = ['ColorPicker', 'gestalt', 'MacOS', 'Nav',
|
|
'OSATerminology', 'icglue',
|
|
# All these are in subdirs
|
|
'_AE', '_AH', '_App', '_CarbonEvt', '_Cm', '_Ctl',
|
|
'_Dlg', '_Drag', '_Evt', '_File', '_Folder', '_Fm',
|
|
'_Help', '_Icn', '_IBCarbon', '_List',
|
|
'_Menu', '_Mlte', '_OSA', '_Res', '_Qd', '_Qdoffs',
|
|
'_Scrap', '_Snd', '_TE', '_Win',
|
|
]
|
|
for name in CARBON_EXTS:
|
|
addMacExtension(name, carbon_kwds)
|
|
|
|
# Application Services & QuickTime
|
|
app_kwds = {'extra_compile_args': carbon_extra_compile_args,
|
|
'extra_link_args': ['-framework','ApplicationServices'],
|
|
}
|
|
addMacExtension('_Launch', app_kwds)
|
|
addMacExtension('_CG', app_kwds)
|
|
|
|
exts.append( Extension('_Qt', ['qt/_Qtmodule.c'],
|
|
extra_compile_args=carbon_extra_compile_args,
|
|
extra_link_args=['-framework', 'QuickTime',
|
|
'-framework', 'Carbon']) )
|
|
|
|
|
|
self.extensions.extend(exts)
|
|
|
|
# Call the method for detecting whether _tkinter can be compiled
|
|
self.detect_tkinter(inc_dirs, lib_dirs)
|
|
|
|
def detect_tkinter_darwin(self, inc_dirs, lib_dirs):
|
|
# The _tkinter module, using frameworks. Since frameworks are quite
|
|
# different the UNIX search logic is not sharable.
|
|
from os.path import join, exists
|
|
framework_dirs = [
|
|
'/System/Library/Frameworks/',
|
|
'/Library/Frameworks',
|
|
join(os.getenv('HOME'), '/Library/Frameworks')
|
|
]
|
|
|
|
# Find the directory that contains the Tcl.framework and Tk.framework
|
|
# bundles.
|
|
# XXX distutils should support -F!
|
|
for F in framework_dirs:
|
|
# both Tcl.framework and Tk.framework should be present
|
|
for fw in 'Tcl', 'Tk':
|
|
if not exists(join(F, fw + '.framework')):
|
|
break
|
|
else:
|
|
# ok, F is now directory with both frameworks. Continure
|
|
# building
|
|
break
|
|
else:
|
|
# Tk and Tcl frameworks not found. Normal "unix" tkinter search
|
|
# will now resume.
|
|
return 0
|
|
|
|
# For 8.4a2, we must add -I options that point inside the Tcl and Tk
|
|
# frameworks. In later release we should hopefully be able to pass
|
|
# the -F option to gcc, which specifies a framework lookup path.
|
|
#
|
|
include_dirs = [
|
|
join(F, fw + '.framework', H)
|
|
for fw in 'Tcl', 'Tk'
|
|
for H in 'Headers', 'Versions/Current/PrivateHeaders'
|
|
]
|
|
|
|
# For 8.4a2, the X11 headers are not included. Rather than include a
|
|
# complicated search, this is a hard-coded path. It could bail out
|
|
# if X11 libs are not found...
|
|
include_dirs.append('/usr/X11R6/include')
|
|
frameworks = ['-framework', 'Tcl', '-framework', 'Tk']
|
|
|
|
ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
|
|
define_macros=[('WITH_APPINIT', 1)],
|
|
include_dirs = include_dirs,
|
|
libraries = [],
|
|
extra_compile_args = frameworks,
|
|
extra_link_args = frameworks,
|
|
)
|
|
self.extensions.append(ext)
|
|
return 1
|
|
|
|
|
|
def detect_tkinter(self, inc_dirs, lib_dirs):
|
|
# The _tkinter module.
|
|
|
|
# Rather than complicate the code below, detecting and building
|
|
# AquaTk is a separate method. Only one Tkinter will be built on
|
|
# Darwin - either AquaTk, if it is found, or X11 based Tk.
|
|
platform = self.get_platform()
|
|
if (platform == 'darwin' and
|
|
self.detect_tkinter_darwin(inc_dirs, lib_dirs)):
|
|
return
|
|
|
|
# Assume we haven't found any of the libraries or include files
|
|
# The versions with dots are used on Unix, and the versions without
|
|
# dots on Windows, for detection by cygwin.
|
|
tcllib = tklib = tcl_includes = tk_includes = None
|
|
for version in ['8.5', '85', '8.4', '84', '8.3', '83', '8.2',
|
|
'82', '8.1', '81', '8.0', '80']:
|
|
tklib = self.compiler.find_library_file(lib_dirs, 'tk' + version)
|
|
tcllib = self.compiler.find_library_file(lib_dirs, 'tcl' + version)
|
|
if tklib and tcllib:
|
|
# Exit the loop when we've found the Tcl/Tk libraries
|
|
break
|
|
|
|
# Now check for the header files
|
|
if tklib and tcllib:
|
|
# Check for the include files on Debian and {Free,Open}BSD, where
|
|
# they're put in /usr/include/{tcl,tk}X.Y
|
|
dotversion = version
|
|
if '.' not in dotversion and "bsd" in sys.platform.lower():
|
|
# OpenBSD and FreeBSD use Tcl/Tk library names like libtcl83.a,
|
|
# but the include subdirs are named like .../include/tcl8.3.
|
|
dotversion = dotversion[:-1] + '.' + dotversion[-1]
|
|
tcl_include_sub = []
|
|
tk_include_sub = []
|
|
for dir in inc_dirs:
|
|
tcl_include_sub += [dir + os.sep + "tcl" + dotversion]
|
|
tk_include_sub += [dir + os.sep + "tk" + dotversion]
|
|
tk_include_sub += tcl_include_sub
|
|
tcl_includes = find_file('tcl.h', inc_dirs, tcl_include_sub)
|
|
tk_includes = find_file('tk.h', inc_dirs, tk_include_sub)
|
|
|
|
if (tcllib is None or tklib is None or
|
|
tcl_includes is None or tk_includes is None):
|
|
self.announce("INFO: Can't locate Tcl/Tk libs and/or headers", 2)
|
|
return
|
|
|
|
# OK... everything seems to be present for Tcl/Tk.
|
|
|
|
include_dirs = [] ; libs = [] ; defs = [] ; added_lib_dirs = []
|
|
for dir in tcl_includes + tk_includes:
|
|
if dir not in include_dirs:
|
|
include_dirs.append(dir)
|
|
|
|
# Check for various platform-specific directories
|
|
if platform == 'sunos5':
|
|
include_dirs.append('/usr/openwin/include')
|
|
added_lib_dirs.append('/usr/openwin/lib')
|
|
elif os.path.exists('/usr/X11R6/include'):
|
|
include_dirs.append('/usr/X11R6/include')
|
|
added_lib_dirs.append('/usr/X11R6/lib64')
|
|
added_lib_dirs.append('/usr/X11R6/lib')
|
|
elif os.path.exists('/usr/X11R5/include'):
|
|
include_dirs.append('/usr/X11R5/include')
|
|
added_lib_dirs.append('/usr/X11R5/lib')
|
|
else:
|
|
# Assume default location for X11
|
|
include_dirs.append('/usr/X11/include')
|
|
added_lib_dirs.append('/usr/X11/lib')
|
|
|
|
# If Cygwin, then verify that X is installed before proceeding
|
|
if platform == 'cygwin':
|
|
x11_inc = find_file('X11/Xlib.h', [], include_dirs)
|
|
if x11_inc is None:
|
|
return
|
|
|
|
# Check for BLT extension
|
|
if self.compiler.find_library_file(lib_dirs + added_lib_dirs,
|
|
'BLT8.0'):
|
|
defs.append( ('WITH_BLT', 1) )
|
|
libs.append('BLT8.0')
|
|
elif self.compiler.find_library_file(lib_dirs + added_lib_dirs,
|
|
'BLT'):
|
|
defs.append( ('WITH_BLT', 1) )
|
|
libs.append('BLT')
|
|
|
|
# Add the Tcl/Tk libraries
|
|
libs.append('tk'+ version)
|
|
libs.append('tcl'+ version)
|
|
|
|
if platform in ['aix3', 'aix4']:
|
|
libs.append('ld')
|
|
|
|
# Finally, link with the X11 libraries (not appropriate on cygwin)
|
|
if platform != "cygwin":
|
|
libs.append('X11')
|
|
|
|
ext = Extension('_tkinter', ['_tkinter.c', 'tkappinit.c'],
|
|
define_macros=[('WITH_APPINIT', 1)] + defs,
|
|
include_dirs = include_dirs,
|
|
libraries = libs,
|
|
library_dirs = added_lib_dirs,
|
|
)
|
|
self.extensions.append(ext)
|
|
|
|
## # Uncomment these lines if you want to play with xxmodule.c
|
|
## ext = Extension('xx', ['xxmodule.c'])
|
|
## self.extensions.append(ext)
|
|
|
|
# XXX handle these, but how to detect?
|
|
# *** Uncomment and edit for PIL (TkImaging) extension only:
|
|
# -DWITH_PIL -I../Extensions/Imaging/libImaging tkImaging.c \
|
|
# *** Uncomment and edit for TOGL extension only:
|
|
# -DWITH_TOGL togl.c \
|
|
# *** Uncomment these for TOGL extension only:
|
|
# -lGL -lGLU -lXext -lXmu \
|
|
|
|
def configure_ctypes(self, ext):
|
|
if not self.use_system_libffi:
|
|
(srcdir,) = sysconfig.get_config_vars('srcdir')
|
|
ffi_builddir = os.path.join(self.build_temp, 'libffi')
|
|
ffi_srcdir = os.path.abspath(os.path.join(srcdir, 'Modules',
|
|
'_ctypes', 'libffi'))
|
|
ffi_configfile = os.path.join(ffi_builddir, 'fficonfig.py')
|
|
|
|
from distutils.dep_util import newer_group
|
|
|
|
config_sources = [os.path.join(ffi_srcdir, fname)
|
|
for fname in os.listdir(ffi_srcdir)]
|
|
if self.force or newer_group(config_sources,
|
|
ffi_configfile):
|
|
from distutils.dir_util import mkpath
|
|
mkpath(ffi_builddir)
|
|
config_args = []
|
|
|
|
# Pass empty CFLAGS because we'll just append the resulting
|
|
# CFLAGS to Python's; -g or -O2 is to be avoided.
|
|
cmd = "cd %s && env CFLAGS='' '%s/configure' %s" \
|
|
% (ffi_builddir, ffi_srcdir, " ".join(config_args))
|
|
|
|
res = os.system(cmd)
|
|
if res or not os.path.exists(ffi_configfile):
|
|
print "Failed to configure _ctypes module"
|
|
return False
|
|
|
|
fficonfig = {}
|
|
execfile(ffi_configfile, globals(), fficonfig)
|
|
ffi_srcdir = os.path.join(fficonfig['ffi_srcdir'], 'src')
|
|
|
|
# Add .S (preprocessed assembly) to C compiler source extensions.
|
|
self.compiler.src_extensions.append('.S')
|
|
|
|
include_dirs = [os.path.join(ffi_builddir, 'include'),
|
|
ffi_builddir, ffi_srcdir]
|
|
extra_compile_args = fficonfig['ffi_cflags'].split()
|
|
|
|
ext.sources.extend(fficonfig['ffi_sources'])
|
|
ext.include_dirs.extend(include_dirs)
|
|
ext.extra_compile_args.extend(extra_compile_args)
|
|
return True
|
|
|
|
def detect_ctypes(self, inc_dirs, lib_dirs):
|
|
self.use_system_libffi = False
|
|
include_dirs = []
|
|
extra_compile_args = []
|
|
extra_link_args = []
|
|
sources = ['_ctypes/_ctypes.c',
|
|
'_ctypes/callbacks.c',
|
|
'_ctypes/callproc.c',
|
|
'_ctypes/stgdict.c',
|
|
'_ctypes/cfield.c',
|
|
'_ctypes/malloc_closure.c']
|
|
depends = ['_ctypes/ctypes.h']
|
|
|
|
if sys.platform == 'darwin':
|
|
sources.append('_ctypes/darwin/dlfcn_simple.c')
|
|
include_dirs.append('_ctypes/darwin')
|
|
# XXX Is this still needed?
|
|
## extra_link_args.extend(['-read_only_relocs', 'warning'])
|
|
|
|
elif sys.platform == 'sunos5':
|
|
# XXX This shouldn't be necessary; it appears that some
|
|
# of the assembler code is non-PIC (i.e. it has relocations
|
|
# when it shouldn't. The proper fix would be to rewrite
|
|
# the assembler code to be PIC.
|
|
# This only works with GCC; the Sun compiler likely refuses
|
|
# this option. If you want to compile ctypes with the Sun
|
|
# compiler, please research a proper solution, instead of
|
|
# finding some -z option for the Sun compiler.
|
|
extra_link_args.append('-mimpure-text')
|
|
|
|
ext = Extension('_ctypes',
|
|
include_dirs=include_dirs,
|
|
extra_compile_args=extra_compile_args,
|
|
extra_link_args=extra_link_args,
|
|
libraries=[],
|
|
sources=sources,
|
|
depends=depends)
|
|
ext_test = Extension('_ctypes_test',
|
|
sources=['_ctypes/_ctypes_test.c'])
|
|
self.extensions.extend([ext, ext_test])
|
|
|
|
if not '--with-system-ffi' in sysconfig.get_config_var("CONFIG_ARGS"):
|
|
return
|
|
|
|
ffi_inc = find_file('ffi.h', [], inc_dirs)
|
|
if ffi_inc is not None:
|
|
ffi_h = ffi_inc[0] + '/ffi.h'
|
|
fp = open(ffi_h)
|
|
while 1:
|
|
line = fp.readline()
|
|
if not line:
|
|
ffi_inc = None
|
|
break
|
|
if line.startswith('#define LIBFFI_H'):
|
|
break
|
|
ffi_lib = None
|
|
if ffi_inc is not None:
|
|
for lib_name in ('ffi_convenience', 'ffi_pic', 'ffi'):
|
|
if (self.compiler.find_library_file(lib_dirs, lib_name)):
|
|
ffi_lib = lib_name
|
|
break
|
|
|
|
if ffi_inc and ffi_lib:
|
|
ext.include_dirs.extend(ffi_inc)
|
|
ext.libraries.append(ffi_lib)
|
|
self.use_system_libffi = True
|
|
|
|
|
|
class PyBuildInstall(install):
|
|
# Suppress the warning about installation into the lib_dynload
|
|
# directory, which is not in sys.path when running Python during
|
|
# installation:
|
|
def initialize_options (self):
|
|
install.initialize_options(self)
|
|
self.warn_dir=0
|
|
|
|
class PyBuildInstallLib(install_lib):
|
|
# Do exactly what install_lib does but make sure correct access modes get
|
|
# set on installed directories and files. All installed files with get
|
|
# mode 644 unless they are a shared library in which case they will get
|
|
# mode 755. All installed directories will get mode 755.
|
|
|
|
so_ext = sysconfig.get_config_var("SO")
|
|
|
|
def install(self):
|
|
outfiles = install_lib.install(self)
|
|
self.set_file_modes(outfiles, 0644, 0755)
|
|
self.set_dir_modes(self.install_dir, 0755)
|
|
return outfiles
|
|
|
|
def set_file_modes(self, files, defaultMode, sharedLibMode):
|
|
if not self.is_chmod_supported(): return
|
|
if not files: return
|
|
|
|
for filename in files:
|
|
if os.path.islink(filename): continue
|
|
mode = defaultMode
|
|
if filename.endswith(self.so_ext): mode = sharedLibMode
|
|
log.info("changing mode of %s to %o", filename, mode)
|
|
if not self.dry_run: os.chmod(filename, mode)
|
|
|
|
def set_dir_modes(self, dirname, mode):
|
|
if not self.is_chmod_supported(): return
|
|
os.path.walk(dirname, self.set_dir_modes_visitor, mode)
|
|
|
|
def set_dir_modes_visitor(self, mode, dirname, names):
|
|
if os.path.islink(dirname): return
|
|
log.info("changing mode of %s to %o", dirname, mode)
|
|
if not self.dry_run: os.chmod(dirname, mode)
|
|
|
|
def is_chmod_supported(self):
|
|
return hasattr(os, 'chmod')
|
|
|
|
SUMMARY = """
|
|
Python is an interpreted, interactive, object-oriented programming
|
|
language. It is often compared to Tcl, Perl, Scheme or Java.
|
|
|
|
Python combines remarkable power with very clear syntax. It has
|
|
modules, classes, exceptions, very high level dynamic data types, and
|
|
dynamic typing. There are interfaces to many system calls and
|
|
libraries, as well as to various windowing systems (X11, Motif, Tk,
|
|
Mac, MFC). New built-in modules are easily written in C or C++. Python
|
|
is also usable as an extension language for applications that need a
|
|
programmable interface.
|
|
|
|
The Python implementation is portable: it runs on many brands of UNIX,
|
|
on Windows, DOS, OS/2, Mac, Amiga... If your favorite system isn't
|
|
listed here, it may still be supported, if there's a C compiler for
|
|
it. Ask around on comp.lang.python -- or just try compiling Python
|
|
yourself.
|
|
"""
|
|
|
|
CLASSIFIERS = """
|
|
Development Status :: 3 - Alpha
|
|
Development Status :: 6 - Mature
|
|
License :: OSI Approved :: Python Software Foundation License
|
|
Natural Language :: English
|
|
Programming Language :: C
|
|
Programming Language :: Python
|
|
Topic :: Software Development
|
|
"""
|
|
|
|
def main():
|
|
# turn off warnings when deprecated modules are imported
|
|
import warnings
|
|
warnings.filterwarnings("ignore",category=DeprecationWarning)
|
|
setup(# PyPI Metadata (PEP 301)
|
|
name = "Python",
|
|
version = sys.version.split()[0],
|
|
url = "http://www.python.org/%s" % sys.version[:3],
|
|
maintainer = "Guido van Rossum and the Python community",
|
|
maintainer_email = "python-dev@python.org",
|
|
description = "A high-level object-oriented programming language",
|
|
long_description = SUMMARY.strip(),
|
|
license = "PSF license",
|
|
classifiers = filter(None, CLASSIFIERS.split("\n")),
|
|
platforms = ["Many"],
|
|
|
|
# Build info
|
|
cmdclass = {'build_ext':PyBuildExt, 'install':PyBuildInstall,
|
|
'install_lib':PyBuildInstallLib},
|
|
# The struct module is defined here, because build_ext won't be
|
|
# called unless there's at least one extension module defined.
|
|
ext_modules=[Extension('_struct', ['_struct.c'])],
|
|
|
|
# Scripts to install
|
|
scripts = ['Tools/scripts/pydoc', 'Tools/scripts/idle',
|
|
'Lib/smtpd.py']
|
|
)
|
|
|
|
# --install-platlib
|
|
if __name__ == '__main__':
|
|
main()
|