mirror of
https://github.com/python/cpython.git
synced 2025-07-07 19:35:27 +00:00
Four months of trunk changes (including a few releases...)
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) ........
This commit is contained in:
Thomas Wouters
parent
16f3e03283
commit
89f507fe8c
363 changed files with 15222 additions and 13805 deletions
|
|
@ -213,6 +213,9 @@ class Unparser:
|
|||
|
||||
def _FunctionDef(self, t):
|
||||
self.write("\n")
|
||||
for deco in t.decorators:
|
||||
self.fill("@")
|
||||
self.dispatch(deco)
|
||||
self.fill("def "+t.name + "(")
|
||||
self.dispatch(t.args)
|
||||
self.write(")")
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ EMACS= emacs
|
|||
|
||||
# The end of this should reflect the major/minor version numbers of
|
||||
# the release:
|
||||
WHATSNEW=whatsnew25
|
||||
WHATSNEW=whatsnew26
|
||||
|
||||
# what's what
|
||||
MANDVIFILES= paper-$(PAPER)/api.dvi paper-$(PAPER)/ext.dvi \
|
||||
|
|
|
|||
|
|
@ -602,15 +602,15 @@ parameter and are called with a non-string parameter.
|
|||
\end{cfuncdesc}
|
||||
|
||||
\begin{cfuncdesc}{PyObject*}{PyString_FromString}{const char *v}
|
||||
Return a new string object with the value \var{v} on success, and
|
||||
\NULL{} on failure. The parameter \var{v} must not be \NULL{}; it
|
||||
will not be checked.
|
||||
Return a new string object with a copy of the string \var{v} as value
|
||||
on success, and \NULL{} on failure. The parameter \var{v} must not be
|
||||
\NULL{}; it will not be checked.
|
||||
\end{cfuncdesc}
|
||||
|
||||
\begin{cfuncdesc}{PyObject*}{PyString_FromStringAndSize}{const char *v,
|
||||
Py_ssize_t len}
|
||||
Return a new string object with the value \var{v} and length
|
||||
\var{len} on success, and \NULL{} on failure. If \var{v} is
|
||||
Return a new string object with a copy of the string \var{v} as value
|
||||
and length \var{len} on success, and \NULL{} on failure. If \var{v} is
|
||||
\NULL{}, the contents of the string are uninitialized.
|
||||
\end{cfuncdesc}
|
||||
|
||||
|
|
@ -2879,10 +2879,10 @@ rather than explicitly calling \cfunction{PyGen_New}.
|
|||
Various date and time objects are supplied by the \module{datetime}
|
||||
module. Before using any of these functions, the header file
|
||||
\file{datetime.h} must be included in your source (note that this is
|
||||
not include by \file{Python.h}), and macro \cfunction{PyDateTime_IMPORT()}
|
||||
must be invoked. The macro arranges to put a pointer to a C structure
|
||||
in a static variable \code{PyDateTimeAPI}, which is used by the following
|
||||
macros.
|
||||
not included by \file{Python.h}), and the macro
|
||||
\cfunction{PyDateTime_IMPORT} must be invoked. The macro puts a
|
||||
pointer to a C structure into a static variable,
|
||||
\code{PyDateTimeAPI}, that is used by the following macros.
|
||||
|
||||
Type-check macros:
|
||||
|
||||
|
|
@ -3080,9 +3080,9 @@ either the abstract object protocol (including
|
|||
\cfunction{PyObject_IsTrue()}, \cfunction{PyObject_Print()}, and
|
||||
\cfunction{PyObject_GetIter()})
|
||||
or the abstract number protocol (including
|
||||
\cfunction{PyNumber_Add()}, \cfunction{PyNumber_Subtract()},
|
||||
\cfunction{PyNumber_And()}, \cfunction{PyNumber_Subtract()},
|
||||
\cfunction{PyNumber_Or()}, \cfunction{PyNumber_Xor()},
|
||||
\cfunction{PyNumber_InPlaceAdd()}, \cfunction{PyNumber_InPlaceSubtract()},
|
||||
\cfunction{PyNumber_InPlaceAnd()}, \cfunction{PyNumber_InPlaceSubtract()},
|
||||
\cfunction{PyNumber_InPlaceOr()}, and \cfunction{PyNumber_InPlaceXor()}).
|
||||
|
||||
\begin{ctypedesc}{PySetObject}
|
||||
|
|
|
|||
|
|
@ -325,7 +325,7 @@ error indicator for each thread.
|
|||
default effect for \constant{SIGINT}\ttindex{SIGINT} is to raise the
|
||||
\withsubitem{(built-in exception)}{\ttindex{KeyboardInterrupt}}
|
||||
\exception{KeyboardInterrupt} exception. If an exception is raised
|
||||
the error indicator is set and the function returns \code{1};
|
||||
the error indicator is set and the function returns \code{-1};
|
||||
otherwise the function returns \code{0}. The error indicator may or
|
||||
may not be cleared if it was previously set.
|
||||
\end{cfuncdesc}
|
||||
|
|
|
|||
5
Doc/dist/dist.tex
vendored
5
Doc/dist/dist.tex
vendored
|
|
@ -3607,6 +3607,11 @@ The class constructor takes a single argument \var{dist}, a
|
|||
|
||||
% todo
|
||||
|
||||
\section{\module{distutils.command.bdist_msi} --- Build a Microsoft Installer binary package}
|
||||
\declaremodule[distutils.command.bdistmsi]{standard}{distutils.command.bdist_msi}
|
||||
\modulesynopsis{Build a binary distribution as a Windows MSI file}
|
||||
|
||||
% todo
|
||||
|
||||
\section{\module{distutils.command.bdist_rpm} --- Build a binary distribution as a Redhat RPM and SRPM}
|
||||
\declaremodule[distutils.command.bdistrpm]{standard}{distutils.command.bdist_rpm}
|
||||
|
|
|
|||
|
|
@ -220,6 +220,8 @@ initspam(void)
|
|||
PyObject *m;
|
||||
|
||||
m = Py_InitModule("spam", SpamMethods);
|
||||
if (m == NULL)
|
||||
return;
|
||||
|
||||
SpamError = PyErr_NewException("spam.error", NULL, NULL);
|
||||
Py_INCREF(SpamError);
|
||||
|
|
@ -364,9 +366,9 @@ is inserted in the dictionary \code{sys.modules} under the key
|
|||
created module based upon the table (an array of \ctype{PyMethodDef}
|
||||
structures) that was passed as its second argument.
|
||||
\cfunction{Py_InitModule()} returns a pointer to the module object
|
||||
that it creates (which is unused here). It aborts with a fatal error
|
||||
if the module could not be initialized satisfactorily, so the caller
|
||||
doesn't need to check for errors.
|
||||
that it creates (which is unused here). It may abort with a fatal error
|
||||
for certain errors, or return \NULL{} if the module could not be
|
||||
initialized satisfactorily.
|
||||
|
||||
When embedding Python, the \cfunction{initspam()} function is not
|
||||
called automatically unless there's an entry in the
|
||||
|
|
@ -1275,6 +1277,8 @@ initspam(void)
|
|||
PyObject *c_api_object;
|
||||
|
||||
m = Py_InitModule("spam", SpamMethods);
|
||||
if (m == NULL)
|
||||
return;
|
||||
|
||||
/* Initialize the C API pointer array */
|
||||
PySpam_API[PySpam_System_NUM] = (void *)PySpam_System;
|
||||
|
|
@ -1361,7 +1365,9 @@ initclient(void)
|
|||
{
|
||||
PyObject *m;
|
||||
|
||||
Py_InitModule("client", ClientMethods);
|
||||
m = Py_InitModule("client", ClientMethods);
|
||||
if (m == NULL)
|
||||
return;
|
||||
if (import_spam() < 0)
|
||||
return;
|
||||
/* additional initialization can happen here */
|
||||
|
|
|
|||
1472
Doc/howto/functional.rst
Normal file
1472
Doc/howto/functional.rst
Normal file
File diff suppressed because it is too large
Load diff
|
|
@ -367,7 +367,7 @@ included with the Python distribution. It allows you to enter REs and
|
|||
strings, and displays whether the RE matches or fails.
|
||||
\file{redemo.py} can be quite useful when trying to debug a
|
||||
complicated RE. Phil Schwartz's
|
||||
\ulink{Kodos}{http://kodos.sourceforge.net} is also an interactive
|
||||
\ulink{Kodos}{http://www.phil-schwartz.com/kodos.spy} is also an interactive
|
||||
tool for developing and testing RE patterns. This HOWTO will use the
|
||||
standard Python interpreter for its examples.
|
||||
|
||||
|
|
|
|||
|
|
@ -632,7 +632,7 @@ Note that these two are \emph{not} equivalent if you supply a different
|
|||
installation base directory when you run the setup script. For example,
|
||||
|
||||
\begin{verbatim}
|
||||
python setup.py --install-base=/tmp
|
||||
python setup.py install --install-base=/tmp
|
||||
\end{verbatim}
|
||||
|
||||
would install pure modules to \filevar{/tmp/python/lib} in the first
|
||||
|
|
|
|||
|
|
@ -198,9 +198,11 @@ Most of these are nearly identical to their socket partners.
|
|||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}{bind}{address}
|
||||
Bind the socket to \var{address}. The socket must not already
|
||||
be bound. (The format of \var{address} depends on the address
|
||||
family --- see above.)
|
||||
Bind the socket to \var{address}. The socket must not already be
|
||||
bound. (The format of \var{address} depends on the address family
|
||||
--- see above.) To mark the socket as re-usable (setting the
|
||||
\constant{SO_REUSEADDR} option), call the \class{dispatcher}
|
||||
object's \method{set_reuse_addr()} method.
|
||||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}{accept}{}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,10 @@ If an exception is raised during execution of the exit handlers, a
|
|||
traceback is printed (unless \exception{SystemExit} is raised) and the
|
||||
exception information is saved. After all exit handlers have had a
|
||||
chance to run the last exception to be raised is re-raised.
|
||||
|
||||
\versionchanged[This function now returns \var{func} which makes it
|
||||
possible to use it as a decorator without binding the
|
||||
original name to \code{None}]{2.6}
|
||||
\end{funcdesc}
|
||||
|
||||
|
||||
|
|
@ -92,3 +96,15 @@ atexit.register(goodbye, 'Donny', 'nice')
|
|||
# or:
|
||||
atexit.register(goodbye, adjective='nice', name='Donny')
|
||||
\end{verbatim}
|
||||
|
||||
Usage as a decorator:
|
||||
|
||||
\begin{verbatim}
|
||||
import atexit
|
||||
|
||||
@atexit.register
|
||||
def goodbye():
|
||||
print "You are now leaving the Python sector."
|
||||
\end{verbatim}
|
||||
|
||||
This obviously only works with functions that don't take arguments.
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@ three alphabets. The legacy interface provides for encoding and
|
|||
decoding to and from file-like objects as well as strings, but only
|
||||
using the Base64 standard alphabet.
|
||||
|
||||
The modern interface provides:
|
||||
The modern interface, which was introduced in Python 2.4, provides:
|
||||
|
||||
\begin{funcdesc}{b64encode}{s\optional{, altchars}}
|
||||
Encode a string use Base64.
|
||||
|
|
|
|||
|
|
@ -19,21 +19,23 @@ The \module{bsddb} module requires a Berkeley DB library version from
|
|||
3.3 thru 4.4.
|
||||
|
||||
\begin{seealso}
|
||||
\seeurl{http://pybsddb.sourceforge.net/}{The website with documentation
|
||||
for the \module{bsddb.db} python Berkeley DB interface that closely mirrors
|
||||
the Sleepycat object oriented interface provided in Berkeley DB 3 and 4.}
|
||||
\seeurl{http://www.sleepycat.com/}{Sleepycat Software produces the
|
||||
Berkeley DB library.}
|
||||
\seeurl{http://pybsddb.sourceforge.net/}
|
||||
{The website with documentation for the \module{bsddb.db}
|
||||
Python Berkeley DB interface that closely mirrors the object
|
||||
oriented interface provided in Berkeley DB 3 and 4.}
|
||||
|
||||
\seeurl{http://www.oracle.com/database/berkeley-db/}
|
||||
{The Berkeley DB library.}
|
||||
\end{seealso}
|
||||
|
||||
A more modern DB, DBEnv and DBSequence object interface is available in the
|
||||
\module{bsddb.db} module which closely matches the Sleepycat Berkeley DB C API
|
||||
\module{bsddb.db} module which closely matches the Berkeley DB C API
|
||||
documented at the above URLs. Additional features provided by the
|
||||
\module{bsddb.db} API include fine tuning, transactions, logging, and
|
||||
multiprocess concurrent database access.
|
||||
|
||||
The following is a description of the legacy \module{bsddb} interface
|
||||
compatible with the old python bsddb module. Starting in Python 2.5 this
|
||||
compatible with the old Python bsddb module. Starting in Python 2.5 this
|
||||
interface should be safe for multithreaded access. The \module{bsddb.db}
|
||||
API is recommended for threading users as it provides better control.
|
||||
|
||||
|
|
|
|||
|
|
@ -48,11 +48,20 @@ Default values can be specified by passing them into the
|
|||
may be passed into the \method{get()} method which will override all
|
||||
others.
|
||||
|
||||
\begin{classdesc}{RawConfigParser}{\optional{defaults}}
|
||||
Sections are normally stored in a builtin dictionary. An alternative
|
||||
dictionary type can be passed to the \class{ConfigParser} constructor.
|
||||
For example, if a dictionary type is passed that sorts its keys,
|
||||
the sections will be sorted on write-back, as will be the keys within
|
||||
each section.
|
||||
|
||||
\begin{classdesc}{RawConfigParser}{\optional{defaults\optional{, dict_type}}}
|
||||
The basic configuration object. When \var{defaults} is given, it is
|
||||
initialized into the dictionary of intrinsic defaults. This class
|
||||
does not support the magical interpolation behavior.
|
||||
initialized into the dictionary of intrinsic defaults. When \var{dict_type}
|
||||
is given, it will be used to create the dictionary objects for the list
|
||||
of sections, for the options within a section, and for the default values.
|
||||
This class does not support the magical interpolation behavior.
|
||||
\versionadded{2.3}
|
||||
\versionchanged[\var{dict_type} was added]{2.6}
|
||||
\end{classdesc}
|
||||
|
||||
\begin{classdesc}{ConfigParser}{\optional{defaults}}
|
||||
|
|
|
|||
|
|
@ -12,6 +12,11 @@ The \module{commands} module contains wrapper functions for
|
|||
return any output generated by the command and, optionally, the exit
|
||||
status.
|
||||
|
||||
The \module{subprocess} module provides more powerful facilities for
|
||||
spawning new processes and retrieving their results. Using the
|
||||
\module{subprocess} module is preferable to using the \module{commands}
|
||||
module.
|
||||
|
||||
The \module{commands} module defines the following functions:
|
||||
|
||||
|
||||
|
|
@ -51,3 +56,7 @@ Example:
|
|||
>>> commands.getstatus('/bin/ls')
|
||||
'-rwxr-xr-x 1 root 13352 Oct 14 1994 /bin/ls'
|
||||
\end{verbatim}
|
||||
|
||||
\begin{seealso}
|
||||
\seemodule{subprocess}{Module for spawning and managing subprocesses.}
|
||||
\end{seealso}
|
||||
|
|
|
|||
|
|
@ -64,9 +64,9 @@ dialect. It may be an instance of a subclass of the \class{Dialect}
|
|||
class or one of the strings returned by the \function{list_dialects}
|
||||
function. The other optional {}\var{fmtparam} keyword arguments can be
|
||||
given to override individual formatting parameters in the current
|
||||
dialect. For more information about the dialect and formatting
|
||||
dialect. For full details about the dialect and formatting
|
||||
parameters, see section~\ref{csv-fmt-params}, ``Dialects and Formatting
|
||||
Parameters'' for details of these parameters.
|
||||
Parameters''.
|
||||
|
||||
All data read are returned as strings. No automatic data type
|
||||
conversion is performed.
|
||||
|
|
@ -96,10 +96,10 @@ parameters specific to a particular CSV dialect. It may be an instance
|
|||
of a subclass of the \class{Dialect} class or one of the strings
|
||||
returned by the \function{list_dialects} function. The other optional
|
||||
{}\var{fmtparam} keyword arguments can be given to override individual
|
||||
formatting parameters in the current dialect. For more information
|
||||
formatting parameters in the current dialect. For full details
|
||||
about the dialect and formatting parameters, see
|
||||
section~\ref{csv-fmt-params}, ``Dialects and Formatting Parameters'' for
|
||||
details of these parameters. To make it as easy as possible to
|
||||
section~\ref{csv-fmt-params}, ``Dialects and Formatting Parameters''.
|
||||
To make it as easy as possible to
|
||||
interface with modules which implement the DB API, the value
|
||||
\constant{None} is written as the empty string. While this isn't a
|
||||
reversible transformation, it makes it easier to dump SQL NULL data values
|
||||
|
|
@ -113,9 +113,8 @@ Associate \var{dialect} with \var{name}. \var{name} must be a string
|
|||
or Unicode object. The dialect can be specified either by passing a
|
||||
sub-class of \class{Dialect}, or by \var{fmtparam} keyword arguments,
|
||||
or both, with keyword arguments overriding parameters of the dialect.
|
||||
For more information about the dialect and formatting parameters, see
|
||||
section~\ref{csv-fmt-params}, ``Dialects and Formatting Parameters''
|
||||
for details of these parameters.
|
||||
For full details about the dialect and formatting parameters, see
|
||||
section~\ref{csv-fmt-params}, ``Dialects and Formatting Parameters''.
|
||||
\end{funcdesc}
|
||||
|
||||
\begin{funcdesc}{unregister_dialect}{name}
|
||||
|
|
@ -197,12 +196,13 @@ attributes, which are used to define the parameters for a specific
|
|||
|
||||
\begin{classdesc}{excel}{}
|
||||
The \class{excel} class defines the usual properties of an Excel-generated
|
||||
CSV file.
|
||||
CSV file. It is registered with the dialect name \code{'excel'}.
|
||||
\end{classdesc}
|
||||
|
||||
\begin{classdesc}{excel_tab}{}
|
||||
The \class{excel_tab} class defines the usual properties of an
|
||||
Excel-generated TAB-delimited file.
|
||||
Excel-generated TAB-delimited file. It is registered with the dialect name
|
||||
\code{'excel-tab'}.
|
||||
\end{classdesc}
|
||||
|
||||
\begin{classdesc}{Sniffer}{}
|
||||
|
|
@ -345,6 +345,7 @@ A read-only description of the dialect in use by the parser.
|
|||
\begin{memberdesc}[csv reader]{line_num}
|
||||
The number of lines read from the source iterator. This is not the same
|
||||
as the number of records returned, as records can span multiple lines.
|
||||
\versionadded{2.5}
|
||||
\end{memberdesc}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1821,7 +1821,7 @@ Here is the wrapping with \code{ctypes}:
|
|||
\begin{quote}
|
||||
\begin{verbatim}>>> from ctypes import c_int, WINFUNCTYPE, windll
|
||||
>>> from ctypes.wintypes import HWND, LPCSTR, UINT
|
||||
>>> prototype = WINFUNCTYPE(c_int, HWND, LPCSTR, LPCSTR, c_uint)
|
||||
>>> prototype = WINFUNCTYPE(c_int, HWND, LPCSTR, LPCSTR, UINT)
|
||||
>>> paramflags = (1, "hwnd", 0), (1, "text", "Hi"), (1, "caption", None), (1, "flags", 0)
|
||||
>>> MessageBox = prototype(("MessageBoxA", windll.user32), paramflags)
|
||||
>>>\end{verbatim}
|
||||
|
|
@ -1848,7 +1848,7 @@ GetWindowRect(
|
|||
|
||||
Here is the wrapping with \code{ctypes}:
|
||||
\begin{quote}
|
||||
\begin{verbatim}>>> from ctypes import POINTER, WINFUNCTYPE, windll
|
||||
\begin{verbatim}>>> from ctypes import POINTER, WINFUNCTYPE, windll, WinError
|
||||
>>> from ctypes.wintypes import BOOL, HWND, RECT
|
||||
>>> prototype = WINFUNCTYPE(BOOL, HWND, POINTER(RECT))
|
||||
>>> paramflags = (1, "hwnd"), (2, "lprect")
|
||||
|
|
@ -2299,12 +2299,10 @@ Windows only: Represents a \class{HRESULT} value, which contains success
|
|||
or error information for a function or method call.
|
||||
\end{classdesc*}
|
||||
|
||||
\code{py{\_}object} : classdesc*
|
||||
\begin{quote}
|
||||
|
||||
Represents the C \code{PyObject *} datatype. Calling this with an
|
||||
without an argument creates a \code{NULL} \code{PyObject *} pointer.
|
||||
\end{quote}
|
||||
\begin{classdesc*}{py_object}
|
||||
Represents the C \code{PyObject *} datatype. Calling this without an
|
||||
argument creates a \code{NULL} \code{PyObject *} pointer.
|
||||
\end{classdesc*}
|
||||
|
||||
The \code{ctypes.wintypes} module provides quite some other Windows
|
||||
specific data types, for example \code{HWND}, \code{WPARAM}, or \code{DWORD}.
|
||||
|
|
@ -2440,5 +2438,6 @@ attributes for names not present in \member{{\_}fields{\_}}.
|
|||
|
||||
\subsubsection{Arrays and pointers\label{ctypes-arrays-pointers}}
|
||||
|
||||
XXX
|
||||
Not yet written - please see section~\ref{ctypes-pointers}, pointers and
|
||||
section~\ref{ctypes-arrays}, arrays in the tutorial.
|
||||
|
||||
|
|
|
|||
|
|
@ -1421,19 +1421,21 @@ The exact range of years for which \method{strftime()} works also
|
|||
varies across platforms. Regardless of platform, years before 1900
|
||||
cannot be used.
|
||||
|
||||
\subsection{Examples}
|
||||
|
||||
\subsubsection{Creating Datetime Objects from Formatted Strings}
|
||||
|
||||
The \class{datetime} class does not directly support parsing formatted time
|
||||
strings. You can use \function{time.strptime} to do the parsing and create
|
||||
a \class{datetime} object from the tuple it returns:
|
||||
|
||||
\begin{verbatim}
|
||||
>>> s = "2005-12-06T12:13:14"
|
||||
>>> from datetime import datetime
|
||||
>>> from time import strptime
|
||||
>>> datetime(*strptime(s, "%Y-%m-%dT%H:%M:%S")[0:6])
|
||||
datetime.datetime(2005, 12, 6, 12, 13, 14)
|
||||
\end{verbatim}
|
||||
|
||||
%%% This example is obsolete, since strptime is now supported by datetime.
|
||||
%
|
||||
% \subsection{Examples}
|
||||
%
|
||||
% \subsubsection{Creating Datetime Objects from Formatted Strings}
|
||||
%
|
||||
% The \class{datetime} class does not directly support parsing formatted time
|
||||
% strings. You can use \function{time.strptime} to do the parsing and create
|
||||
% a \class{datetime} object from the tuple it returns:
|
||||
%
|
||||
% \begin{verbatim}
|
||||
% >>> s = "2005-12-06T12:13:14"
|
||||
% >>> from datetime import datetime
|
||||
% >>> from time import strptime
|
||||
% >>> datetime(*strptime(s, "%Y-%m-%dT%H:%M:%S")[0:6])
|
||||
% datetime.datetime(2005, 12, 6, 12, 13, 14)
|
||||
% \end{verbatim}
|
||||
%
|
||||
|
|
|
|||
|
|
@ -435,36 +435,37 @@ Each thread has its own current context which is accessed or changed using
|
|||
the \function{getcontext()} and \function{setcontext()} functions:
|
||||
|
||||
\begin{funcdesc}{getcontext}{}
|
||||
Return the current context for the active thread.
|
||||
Return the current context for the active thread.
|
||||
\end{funcdesc}
|
||||
|
||||
\begin{funcdesc}{setcontext}{c}
|
||||
Set the current context for the active thread to \var{c}.
|
||||
Set the current context for the active thread to \var{c}.
|
||||
\end{funcdesc}
|
||||
|
||||
Beginning with Python 2.5, you can also use the \keyword{with} statement
|
||||
to temporarily change the active context. For example the following code
|
||||
increases the current decimal precision by 2 places, performs a
|
||||
calculation, and then automatically restores the previous context:
|
||||
and the \function{localcontext()} function to temporarily change the
|
||||
active context.
|
||||
|
||||
\begin{funcdesc}{localcontext}{\optional{c}}
|
||||
Return a context manager that will set the current context for
|
||||
the active thread to a copy of \var{c} on entry to the with-statement
|
||||
and restore the previous context when exiting the with-statement. If
|
||||
no context is specified, a copy of the current context is used.
|
||||
\versionadded{2.5}
|
||||
|
||||
For example, the following code sets the current decimal precision
|
||||
to 42 places, performs a calculation, and then automatically restores
|
||||
the previous context:
|
||||
\begin{verbatim}
|
||||
from __future__ import with_statement
|
||||
import decimal
|
||||
from __future__ import with_statement
|
||||
from decimal import localcontext
|
||||
|
||||
with decimal.getcontext() as ctx:
|
||||
ctx.prec += 2 # add 2 more digits of precision
|
||||
calculate_something()
|
||||
with localcontext() as ctx:
|
||||
ctx.prec = 42 # Perform a high precision calculation
|
||||
s = calculate_something()
|
||||
s = +s # Round the final result back to the default precision
|
||||
\end{verbatim}
|
||||
|
||||
The context that's active in the body of the \keyword{with} statement is
|
||||
a \emph{copy} of the context you provided to the \keyword{with}
|
||||
statement, so modifying its attributes doesn't affect anything except
|
||||
that temporary copy.
|
||||
|
||||
You can use any decimal context in a \keyword{with} statement, but if
|
||||
you just want to make a temporary change to some aspect of the current
|
||||
context, it's easiest to just use \function{getcontext()} as shown
|
||||
above.
|
||||
\end{funcdesc}
|
||||
|
||||
New contexts can also be created using the \class{Context} constructor
|
||||
described below. In addition, the module provides three pre-made
|
||||
|
|
|
|||
|
|
@ -1,45 +1,34 @@
|
|||
\section{\module{elementtree} --- The xml.etree.ElementTree Module}
|
||||
\declaremodule{standard}{elementtree}
|
||||
\section{\module{xml.etree.ElementTree} --- The ElementTree XML API}
|
||||
\declaremodule{standard}{xml.etree.ElementTree}
|
||||
\moduleauthor{Fredrik Lundh}{fredrik@pythonware.com}
|
||||
\modulesynopsis{This module provides implementations
|
||||
of the Element and ElementTree types, plus support classes.
|
||||
\modulesynopsis{Implementation of the ElementTree API.}
|
||||
|
||||
A C version of this API is available as xml.etree.cElementTree.}
|
||||
\versionadded{2.5}
|
||||
|
||||
|
||||
\subsection{Overview\label{elementtree-overview}}
|
||||
|
||||
The Element type is a flexible container object, designed to store
|
||||
hierarchical data structures in memory. The type can be described as a
|
||||
cross between a list and a dictionary.
|
||||
|
||||
Each element has a number of properties associated with it:
|
||||
|
||||
\begin{itemize}
|
||||
\item {}
|
||||
a tag which is a string identifying what kind of data
|
||||
this element represents (the element type, in other words).
|
||||
|
||||
\item {}
|
||||
a number of attributes, stored in a Python dictionary.
|
||||
|
||||
\item {}
|
||||
a text string.
|
||||
|
||||
\item {}
|
||||
an optional tail string.
|
||||
|
||||
\item {}
|
||||
a number of child elements, stored in a Python sequence
|
||||
|
||||
\item a tag which is a string identifying what kind of data
|
||||
this element represents (the element type, in other words).
|
||||
\item a number of attributes, stored in a Python dictionary.
|
||||
\item a text string.
|
||||
\item an optional tail string.
|
||||
\item a number of child elements, stored in a Python sequence
|
||||
\end{itemize}
|
||||
|
||||
To create an element instance, use the Element or SubElement factory
|
||||
functions.
|
||||
|
||||
The ElementTree class can be used to wrap an element
|
||||
The \class{ElementTree} class can be used to wrap an element
|
||||
structure, and convert it from and to XML.
|
||||
|
||||
A C implementation of this API is available as
|
||||
\module{xml.etree.cElementTree}.
|
||||
|
||||
|
||||
\subsection{Functions\label{elementtree-functions}}
|
||||
|
||||
|
|
|
|||
|
|
@ -7,6 +7,11 @@
|
|||
\sectionauthor{Lee Busby}{busby1@llnl.gov}
|
||||
\modulesynopsis{Provide control for floating point exception handling.}
|
||||
|
||||
\note{The \module{fpectl} module is not built by default, and its usage
|
||||
is discouraged and may be dangerous except in the hands of
|
||||
experts. See also the section \ref{fpectl-limitations} on
|
||||
limitations for more details.}
|
||||
|
||||
Most computers carry out floating point operations\index{IEEE-754}
|
||||
in conformance with the so-called IEEE-754 standard.
|
||||
On any real computer,
|
||||
|
|
@ -95,7 +100,7 @@ FloatingPointError: in math_1
|
|||
\end{verbatim}
|
||||
|
||||
|
||||
\subsection{Limitations and other considerations}
|
||||
\subsection{Limitations and other considerations \label{fpectl-limitations}}
|
||||
|
||||
Setting up a given processor to trap IEEE-754 floating point
|
||||
errors currently requires custom code on a per-architecture basis.
|
||||
|
|
|
|||
|
|
@ -808,7 +808,7 @@ class C:
|
|||
|
||||
\begin{verbatim}
|
||||
class C(object):
|
||||
def __init__(self): self.__x = None
|
||||
def __init__(self): self._x = None
|
||||
def getx(self): return self._x
|
||||
def setx(self, value): self._x = value
|
||||
def delx(self): del self._x
|
||||
|
|
|
|||
|
|
@ -126,8 +126,9 @@ import getopt, sys
|
|||
def main():
|
||||
try:
|
||||
opts, args = getopt.getopt(sys.argv[1:], "ho:v", ["help", "output="])
|
||||
except getopt.GetoptError:
|
||||
except getopt.GetoptError, err:
|
||||
# print help information and exit:
|
||||
print str(err) # will print something like "option -a not recognized"
|
||||
usage()
|
||||
sys.exit(2)
|
||||
output = None
|
||||
|
|
@ -135,11 +136,13 @@ def main():
|
|||
for o, a in opts:
|
||||
if o == "-v":
|
||||
verbose = True
|
||||
if o in ("-h", "--help"):
|
||||
elif o in ("-h", "--help"):
|
||||
usage()
|
||||
sys.exit()
|
||||
if o in ("-o", "--output"):
|
||||
elif o in ("-o", "--output"):
|
||||
output = a
|
||||
else:
|
||||
assert False, "unhandled option"
|
||||
# ...
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
|
|
|||
|
|
@ -86,8 +86,8 @@ arguments: \code{m.update(a); m.update(b)} is equivalent to
|
|||
|
||||
\begin{methoddesc}[hash]{digest}{}
|
||||
Return the digest of the strings passed to the \method{update()}
|
||||
method so far. This is a 16-byte string which may contain
|
||||
non-\ASCII{} characters, including null bytes.
|
||||
method so far. This is a string of \member{digest_size} bytes which may
|
||||
contain non-\ASCII{} characters, including null bytes.
|
||||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}[hash]{hexdigest}{}
|
||||
|
|
|
|||
|
|
@ -76,14 +76,14 @@ Example of use:
|
|||
>>> for item in data:
|
||||
... heappush(heap, item)
|
||||
...
|
||||
>>> sorted = []
|
||||
>>> ordered = []
|
||||
>>> while heap:
|
||||
... sorted.append(heappop(heap))
|
||||
... ordered.append(heappop(heap))
|
||||
...
|
||||
>>> print sorted
|
||||
>>> print ordered
|
||||
[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
|
||||
>>> data.sort()
|
||||
>>> print data == sorted
|
||||
>>> print data == ordered
|
||||
True
|
||||
>>>
|
||||
\end{verbatim}
|
||||
|
|
|
|||
|
|
@ -304,9 +304,14 @@ Example: \code{httplib.responses[httplib.NOT_FOUND]} is \code{'Not Found'}.
|
|||
This will send a request to the server using the HTTP request method
|
||||
\var{method} and the selector \var{url}. If the \var{body} argument is
|
||||
present, it should be a string of data to send after the headers are finished.
|
||||
Alternatively, it may be an open file object, in which case the
|
||||
contents of the file is sent; this file object should support
|
||||
\code{fileno()} and \code{read()} methods.
|
||||
The header Content-Length is automatically set to the correct value.
|
||||
The \var{headers} argument should be a mapping of extra HTTP headers to send
|
||||
with the request.
|
||||
|
||||
\versionchanged[\var{body} can be a file object]{2.6}
|
||||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}{getresponse}{}
|
||||
|
|
|
|||
|
|
@ -161,10 +161,10 @@ Unused.
|
|||
|
||||
\begin{funcdesc}{init_builtin}{name}
|
||||
Initialize the built-in module called \var{name} and return its module
|
||||
object. If the module was already initialized, it will be initialized
|
||||
\emph{again}. A few modules cannot be initialized twice --- attempting
|
||||
to initialize these again will raise an \exception{ImportError}
|
||||
exception. If there is no
|
||||
object along with storing it in \code{sys.modules}. If the module was already
|
||||
initialized, it will be initialized \emph{again}. Re-initialization involves
|
||||
the copying of the built-in module's \code{__dict__} from the cached
|
||||
module over the module's entry in \code{sys.modules}. If there is no
|
||||
built-in module called \var{name}, \code{None} is returned.
|
||||
\end{funcdesc}
|
||||
|
||||
|
|
@ -208,14 +208,15 @@ user-defined class emulating a file.
|
|||
\begin{funcdesc}{load_dynamic}{name, pathname\optional{, file}}
|
||||
Load and initialize a module implemented as a dynamically loadable
|
||||
shared library and return its module object. If the module was
|
||||
already initialized, it will be initialized \emph{again}. Some modules
|
||||
don't like that and may raise an exception. The \var{pathname}
|
||||
argument must point to the shared library. The \var{name} argument is
|
||||
used to construct the name of the initialization function: an external
|
||||
C function called \samp{init\var{name}()} in the shared library is
|
||||
called. The optional \var{file} argument is ignored. (Note: using
|
||||
shared libraries is highly system dependent, and not all systems
|
||||
support it.)
|
||||
already initialized, it will be initialized \emph{again}.
|
||||
Re-initialization involves copying the \code{__dict__} attribute of the cached
|
||||
instance of the module over the value used in the module cached in
|
||||
\code{sys.modules}. The \var{pathname} argument must point to the shared
|
||||
library. The \var{name} argument is used to construct the name of the
|
||||
initialization function: an external C function called
|
||||
\samp{init\var{name}()} in the shared library is called. The optional
|
||||
\var{file} argument is ignored. (Note: using shared libraries is highly
|
||||
system dependent, and not all systems support it.)
|
||||
\end{funcdesc}
|
||||
|
||||
\begin{funcdesc}{load_source}{name, pathname\optional{, file}}
|
||||
|
|
|
|||
|
|
@ -474,8 +474,8 @@ def iteritems(mapping):
|
|||
return izip(mapping.iterkeys(), mapping.itervalues())
|
||||
|
||||
def nth(iterable, n):
|
||||
"Returns the nth item"
|
||||
return list(islice(iterable, n, n+1))
|
||||
"Returns the nth item or raise IndexError"
|
||||
return list(islice(iterable, n, n+1))[0]
|
||||
|
||||
def all(seq, pred=None):
|
||||
"Returns True if pred(x) is true for every element in the iterable"
|
||||
|
|
|
|||
|
|
@ -528,8 +528,8 @@ as those created locally. Logger-level filtering is applied using
|
|||
\method{filter()}.
|
||||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}{makeRecord}{name, lvl, fn, lno, msg, args, exc_info,
|
||||
func, extra}
|
||||
\begin{methoddesc}{makeRecord}{name, lvl, fn, lno, msg, args, exc_info
|
||||
\optional{, func, extra}}
|
||||
This is a factory method which can be overridden in subclasses to create
|
||||
specialized \class{LogRecord} instances.
|
||||
\versionchanged[\var{func} and \var{extra} were added]{2.5}
|
||||
|
|
@ -1397,6 +1397,9 @@ Currently, the useful mapping keys in a \class{LogRecord} are:
|
|||
(if available).}
|
||||
\lineii{\%(created)f} {Time when the \class{LogRecord} was created (as
|
||||
returned by \function{time.time()}).}
|
||||
\lineii{\%(relativeCreated)d} {Time in milliseconds when the LogRecord was
|
||||
created, relative to the time the logging module was
|
||||
loaded.}
|
||||
\lineii{\%(asctime)s} {Human-readable time when the \class{LogRecord}
|
||||
was created. By default this is of the form
|
||||
``2003-07-08 16:49:45,896'' (the numbers after the
|
||||
|
|
@ -1479,7 +1482,7 @@ source line where the logging call was made, and any exception
|
|||
information to be logged.
|
||||
|
||||
\begin{classdesc}{LogRecord}{name, lvl, pathname, lineno, msg, args,
|
||||
exc_info}
|
||||
exc_info \optional{, func}}
|
||||
Returns an instance of \class{LogRecord} initialized with interesting
|
||||
information. The \var{name} is the logger name; \var{lvl} is the
|
||||
numeric level; \var{pathname} is the absolute pathname of the source
|
||||
|
|
@ -1489,7 +1492,9 @@ user-supplied message (a format string); \var{args} is the tuple
|
|||
which, together with \var{msg}, makes up the user message; and
|
||||
\var{exc_info} is the exception tuple obtained by calling
|
||||
\function{sys.exc_info() }(or \constant{None}, if no exception information
|
||||
is available).
|
||||
is available). The \var{func} is the name of the function from which the
|
||||
logging call was made. If not specified, it defaults to \var{None}.
|
||||
\versionchanged[\var{func} was added]{2.5}
|
||||
\end{classdesc}
|
||||
|
||||
\begin{methoddesc}{getMessage}{}
|
||||
|
|
|
|||
|
|
@ -344,8 +344,8 @@ the string inside the exception will contain more detail.
|
|||
\subsection{Features\label{features}}
|
||||
|
||||
\begin{classdesc}{Feature}{database, id, title, desc, display\optional{,
|
||||
level=1\optional{, parent\optional\{, directory\optional{,
|
||||
attributes=0}}}}
|
||||
level=1\optional{, parent\optional{, directory\optional{,
|
||||
attributes=0}}}}}
|
||||
|
||||
Add a new record to the \code{Feature} table, using the values
|
||||
\var{id}, \var{parent.id}, \var{title}, \var{desc}, \var{display},
|
||||
|
|
|
|||
|
|
@ -361,6 +361,10 @@ object, except that when the exit status is zero (termination without
|
|||
errors), \code{None} is returned.
|
||||
Availability: Macintosh, \UNIX, Windows.
|
||||
|
||||
The \module{subprocess} module provides more powerful facilities for
|
||||
spawning new processes and retrieving their results; using that module
|
||||
is preferable to using this function.
|
||||
|
||||
\versionchanged[This function worked unreliably under Windows in
|
||||
earlier versions of Python. This was due to the use of the
|
||||
\cfunction{_popen()} function from the libraries provided with
|
||||
|
|
@ -375,8 +379,13 @@ deleted once there are no file descriptors for the file.
|
|||
Availability: Macintosh, \UNIX, Windows.
|
||||
\end{funcdesc}
|
||||
|
||||
There are a number of different \function{popen*()} functions that
|
||||
provide slightly different ways to create subprocesses. Note that the
|
||||
\module{subprocess} module is easier to use and more powerful;
|
||||
consider using that module before writing code using the
|
||||
lower-level \function{popen*()} functions.
|
||||
|
||||
For each of the following \function{popen()} variants, if \var{bufsize} is
|
||||
For each of the \function{popen*()} variants, if \var{bufsize} is
|
||||
specified, it specifies the buffer size for the I/O pipes.
|
||||
\var{mode}, if provided, should be the string \code{'b'} or
|
||||
\code{'t'}; on Windows this is needed to determine whether the file
|
||||
|
|
@ -920,6 +929,8 @@ Return a string representing the path to which the symbolic link
|
|||
points. The result may be either an absolute or relative pathname; if
|
||||
it is relative, it may be converted to an absolute pathname using
|
||||
\code{os.path.join(os.path.dirname(\var{path}), \var{result})}.
|
||||
\versionchanged [If the \var{path} is a Unicode object the result will also
|
||||
be a Unicode object]{2.6}
|
||||
Availability: Macintosh, \UNIX.
|
||||
\end{funcdesc}
|
||||
|
||||
|
|
@ -1545,7 +1556,13 @@ functions are described in section \ref{os-newstreams}.
|
|||
\funcline{spawnve}{mode, path, args, env}
|
||||
\funcline{spawnvp}{mode, file, args}
|
||||
\funcline{spawnvpe}{mode, file, args, env}
|
||||
Execute the program \var{path} in a new process. If \var{mode} is
|
||||
Execute the program \var{path} in a new process.
|
||||
|
||||
(Note that the \module{subprocess} module provides more powerful
|
||||
facilities for spawning new processes and retrieving their results;
|
||||
using that module is preferable to using these functions.)
|
||||
|
||||
If \var{mode} is
|
||||
\constant{P_NOWAIT}, this function returns the process ID of the new
|
||||
process; if \var{mode} is \constant{P_WAIT}, returns the process's
|
||||
exit code if it exits normally, or \code{-\var{signal}}, where
|
||||
|
|
@ -1682,6 +1699,10 @@ and XP) this is the exit status of the command run; on systems using
|
|||
a non-native shell, consult your shell documentation.
|
||||
|
||||
Availability: Macintosh, \UNIX, Windows.
|
||||
|
||||
The \module{subprocess} module provides more powerful facilities for
|
||||
spawning new processes and retrieving their results; using that module
|
||||
is preferable to using this function.
|
||||
\end{funcdesc}
|
||||
|
||||
\begin{funcdesc}{times}{}
|
||||
|
|
|
|||
|
|
@ -519,7 +519,7 @@ as their value. The semantics of each element are:
|
|||
version of the object. The next element of the tuple will provide
|
||||
arguments for this callable, and later elements provide additional
|
||||
state information that will subsequently be used to fully reconstruct
|
||||
the pickled date.
|
||||
the pickled data.
|
||||
|
||||
In the unpickling environment this object must be either a class, a
|
||||
callable registered as a ``safe constructor'' (see below), or it must
|
||||
|
|
|
|||
|
|
@ -11,10 +11,10 @@ This module allows you to spawn processes and connect to their
|
|||
input/output/error pipes and obtain their return codes under
|
||||
\UNIX{} and Windows.
|
||||
|
||||
Note that starting with Python 2.0, this functionality is available
|
||||
using functions from the \refmodule{os} module which have the same
|
||||
names as the factory functions here, but the order of the return
|
||||
values is more intuitive in the \refmodule{os} module variants.
|
||||
The \module{subprocess} module provides more powerful facilities for
|
||||
spawning new processes and retrieving their results. Using the
|
||||
\module{subprocess} module is preferable to using the \module{popen2}
|
||||
module.
|
||||
|
||||
The primary interface offered by this module is a trio of factory
|
||||
functions. For each of these, if \var{bufsize} is specified,
|
||||
|
|
@ -184,3 +184,7 @@ integrate I/O over pipes with their \function{select()} loops, or use
|
|||
separate threads to read each of the individual files provided by
|
||||
whichever \function{popen*()} function or \class{Popen*} class was
|
||||
used.
|
||||
|
||||
\begin{seealso}
|
||||
\seemodule{subprocess}{Module for spawning and managing subprocesses.}
|
||||
\end{seealso}
|
||||
|
|
|
|||
|
|
@ -216,9 +216,10 @@ any time.
|
|||
|
||||
\begin{memberdesc}[xmlparser]{returns_unicode}
|
||||
If this attribute is set to a non-zero integer, the handler functions
|
||||
will be passed Unicode strings. If \member{returns_unicode} is 0,
|
||||
8-bit strings containing UTF-8 encoded data will be passed to the
|
||||
handlers.
|
||||
will be passed Unicode strings. If \member{returns_unicode} is
|
||||
\constant{False}, 8-bit strings containing UTF-8 encoded data will be
|
||||
passed to the handlers. This is \constant{True} by default when
|
||||
Python is built with Unicode support.
|
||||
\versionchanged[Can be changed at any time to affect the result
|
||||
type]{1.6}
|
||||
\end{memberdesc}
|
||||
|
|
|
|||
|
|
@ -28,6 +28,18 @@ For normal use, you should only require the initialization/connect,
|
|||
included below.
|
||||
\end{classdesc}
|
||||
|
||||
\begin{classdesc}{SMTP_SSL}{\optional{host\optional{, port\optional{,
|
||||
local_hostname\optional{,
|
||||
keyfile\optional{,
|
||||
certfile}}}}}}
|
||||
A \class{SMTP_SSL} instance behaves exactly the same as instances of \class{SMTP}.
|
||||
\class{SMTP_SSL} should be used for situations where SSL is required from
|
||||
the beginning of the connection and using \method{starttls()} is not appropriate.
|
||||
If \var{host} is not specified, the local host is used. If \var{port} is
|
||||
omitted, the standard SMTP-over-SSL port (465) is used. \var{keyfile} and \var{certfile}
|
||||
are also optional, and can contain a PEM formatted private key and
|
||||
certificate chain file for the SSL connection.
|
||||
\end{classdesc}
|
||||
|
||||
A nice selection of exceptions is defined as well:
|
||||
|
||||
|
|
|
|||
|
|
@ -241,8 +241,8 @@ If you want to know the current machine's IP address, you may want to use
|
|||
This operation assumes that there is a valid address-to-host mapping for
|
||||
the host, and the assumption does not always hold.
|
||||
Note: \function{gethostname()} doesn't always return the fully qualified
|
||||
domain name; use \code{gethostbyaddr(gethostname())}
|
||||
(see below).
|
||||
domain name; use \code{getfqdn()}
|
||||
(see above).
|
||||
\end{funcdesc}
|
||||
|
||||
\begin{funcdesc}{gethostbyaddr}{ip_address}
|
||||
|
|
@ -712,14 +712,15 @@ read until EOF. The return value is a string of the bytes read.
|
|||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}{server}{}
|
||||
Returns a string containing the ASN.1 distinguished name identifying the
|
||||
server's certificate. (See below for an example
|
||||
showing what distinguished names look like.)
|
||||
Returns a string describing the server's certificate.
|
||||
Useful for debugging purposes; do not parse the content of this string
|
||||
because its format can't be parsed unambiguously.
|
||||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}{issuer}{}
|
||||
Returns a string containing the ASN.1 distinguished name identifying the
|
||||
issuer of the server's certificate.
|
||||
Returns a string describing the issuer of the server's certificate.
|
||||
Useful for debugging purposes; do not parse the content of this string
|
||||
because its format can't be parsed unambiguously.
|
||||
\end{methoddesc}
|
||||
|
||||
\subsection{Example \label{socket-example}}
|
||||
|
|
|
|||
|
|
@ -6,14 +6,16 @@
|
|||
\sectionauthor{Gerhard Häring}{gh@ghaering.de}
|
||||
\versionadded{2.5}
|
||||
|
||||
SQLite is a C library that provides a SQL-language database that
|
||||
stores data in disk files without requiring a separate server process.
|
||||
SQLite is a C library that provides a lightweight disk-based database
|
||||
that doesn't require a separate server process and allows accessing
|
||||
the database using a nonstandard variant of the SQL query language.
|
||||
Some applications can use SQLite for internal data storage. It's also
|
||||
possible to prototype an application using SQLite and then port the
|
||||
code to a larger database such as PostgreSQL or Oracle.
|
||||
|
||||
pysqlite was written by Gerhard H\"aring and provides a SQL interface
|
||||
compliant with the DB-API 2.0 specification described by
|
||||
\pep{249}. This means that it should be possible to write the first
|
||||
version of your applications using SQLite for data storage. If
|
||||
switching to a larger database such as PostgreSQL or Oracle is
|
||||
later necessary, the switch should be relatively easy.
|
||||
\pep{249}.
|
||||
|
||||
To use the module, you must first create a \class{Connection} object
|
||||
that represents the database. Here the data will be stored in the
|
||||
|
|
@ -34,8 +36,8 @@ c = conn.cursor()
|
|||
|
||||
# Create table
|
||||
c.execute('''create table stocks
|
||||
(date timestamp, trans varchar, symbol varchar,
|
||||
qty decimal, price decimal)''')
|
||||
(date text, trans text, symbol text,
|
||||
qty real, price real)''')
|
||||
|
||||
# Insert a row of data
|
||||
c.execute("""insert into stocks
|
||||
|
|
@ -144,11 +146,11 @@ committed. The \var{timeout} parameter specifies how long the connection should
|
|||
wait for the lock to go away until raising an exception. The default for the
|
||||
timeout parameter is 5.0 (five seconds).
|
||||
|
||||
For the \var{isolation_level} parameter, please see \member{isolation_level}
|
||||
\ref{sqlite3-Connection-IsolationLevel} property of \class{Connection} objects.
|
||||
For the \var{isolation_level} parameter, please see the \member{isolation_level}
|
||||
property of \class{Connection} objects in section~\ref{sqlite3-Connection-IsolationLevel}.
|
||||
|
||||
SQLite natively supports only the types TEXT, INTEGER, FLOAT, BLOB and NULL. If
|
||||
you want to use other types, like you have to add support for them yourself.
|
||||
you want to use other types you must add support for them yourself.
|
||||
The \var{detect_types} parameter and the using custom \strong{converters} registered with
|
||||
the module-level \function{register_converter} function allow you to easily do that.
|
||||
|
||||
|
|
@ -195,7 +197,7 @@ This can be used to build a shell for SQLite, like in the following example:
|
|||
\verbatiminput{sqlite3/complete_statement.py}
|
||||
\end{funcdesc}
|
||||
|
||||
\begin{funcdesc}{}enable_callback_tracebacks{flag}
|
||||
\begin{funcdesc}{enable_callback_tracebacks}{flag}
|
||||
By default you will not get any tracebacks in user-defined functions,
|
||||
aggregates, converters, authorizer callbacks etc. If you want to debug them,
|
||||
you can call this function with \var{flag} as True. Afterwards, you will get
|
||||
|
|
@ -210,13 +212,14 @@ A \class{Connection} instance has the following attributes and methods:
|
|||
\label{sqlite3-Connection-IsolationLevel}
|
||||
\begin{memberdesc}{isolation_level}
|
||||
Get or set the current isolation level. None for autocommit mode or one of
|
||||
"DEFERRED", "IMMEDIATE" or "EXLUSIVE". See Controlling Transactions
|
||||
\ref{sqlite3-Controlling-Transactions} for a more detailed explanation.
|
||||
"DEFERRED", "IMMEDIATE" or "EXLUSIVE". See ``Controlling Transactions'',
|
||||
section~\ref{sqlite3-Controlling-Transactions}, for a more detailed explanation.
|
||||
\end{memberdesc}
|
||||
|
||||
\begin{methoddesc}{cursor}{\optional{cursorClass}}
|
||||
The cursor method accepts a single optional parameter \var{cursorClass}.
|
||||
This is a custom cursor class which must extend \class{sqlite3.Cursor}.
|
||||
If supplied, this must be a custom cursor class that extends
|
||||
\class{sqlite3.Cursor}.
|
||||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}{execute}{sql, \optional{parameters}}
|
||||
|
|
@ -242,7 +245,7 @@ parameters given.
|
|||
Creates a user-defined function that you can later use from within SQL
|
||||
statements under the function name \var{name}. \var{num_params} is the number
|
||||
of parameters the function accepts, and \var{func} is a Python callable that is
|
||||
called as SQL function.
|
||||
called as the SQL function.
|
||||
|
||||
The function can return any of the types supported by SQLite: unicode, str,
|
||||
int, long, float, buffer and None.
|
||||
|
|
@ -272,7 +275,7 @@ Example:
|
|||
|
||||
Creates a collation with the specified \var{name} and \var{callable}. The
|
||||
callable will be passed two string arguments. It should return -1 if the first
|
||||
is ordered lower than the second, 0 if they are ordered equal and 1 and if the
|
||||
is ordered lower than the second, 0 if they are ordered equal and 1 if the
|
||||
first is ordered higher than the second. Note that this controls sorting
|
||||
(ORDER BY in SQL) so your comparisons don't affect other SQL operations.
|
||||
|
||||
|
|
@ -321,20 +324,21 @@ module.
|
|||
|
||||
\begin{memberdesc}{row_factory}
|
||||
You can change this attribute to a callable that accepts the cursor and
|
||||
the original row as tuple and will return the real result row. This
|
||||
way, you can implement more advanced ways of returning results, like
|
||||
ones that can also access columns by name.
|
||||
the original row as a tuple and will return the real result row. This
|
||||
way, you can implement more advanced ways of returning results, such
|
||||
as returning an object that can also access columns by name.
|
||||
|
||||
Example:
|
||||
|
||||
\verbatiminput{sqlite3/row_factory.py}
|
||||
|
||||
If the standard tuple types don't suffice for you, and you want name-based
|
||||
If returning a tuple doesn't suffice and you want name-based
|
||||
access to columns, you should consider setting \member{row_factory} to the
|
||||
highly-optimized sqlite3.Row type. It provides both
|
||||
highly-optimized \class{sqlite3.Row} type. \class{Row} provides both
|
||||
index-based and case-insensitive name-based access to columns with almost
|
||||
no memory overhead. Much better than your own custom dictionary-based
|
||||
approach or even a db_row based solution.
|
||||
no memory overhead. It will probably be better than your own custom
|
||||
dictionary-based approach or even a db_row based solution.
|
||||
% XXX what's a db_row-based solution?
|
||||
\end{memberdesc}
|
||||
|
||||
\begin{memberdesc}{text_factory}
|
||||
|
|
@ -348,7 +352,7 @@ module.
|
|||
attribute to \constant{sqlite3.OptimizedUnicode}.
|
||||
|
||||
You can also set it to any other callable that accepts a single bytestring
|
||||
parameter and returns the result object.
|
||||
parameter and returns the resulting object.
|
||||
|
||||
See the following example code for illustration:
|
||||
|
||||
|
|
@ -356,7 +360,7 @@ module.
|
|||
\end{memberdesc}
|
||||
|
||||
\begin{memberdesc}{total_changes}
|
||||
Returns the total number of database rows that have be modified, inserted,
|
||||
Returns the total number of database rows that have been modified, inserted,
|
||||
or deleted since the database connection was opened.
|
||||
\end{memberdesc}
|
||||
|
||||
|
|
@ -383,9 +387,9 @@ This example shows how to use the named style:
|
|||
|
||||
\verbatiminput{sqlite3/execute_2.py}
|
||||
|
||||
\method{execute} will only execute a single SQL statement. If you try to
|
||||
\method{execute()} will only execute a single SQL statement. If you try to
|
||||
execute more than one statement with it, it will raise a Warning. Use
|
||||
\method{executescript} if want to execute multiple SQL statements with one
|
||||
\method{executescript()} if you want to execute multiple SQL statements with one
|
||||
call.
|
||||
\end{methoddesc}
|
||||
|
||||
|
|
@ -393,7 +397,7 @@ This example shows how to use the named style:
|
|||
\begin{methoddesc}{executemany}{sql, seq_of_parameters}
|
||||
Executes a SQL command against all parameter sequences or mappings found in the
|
||||
sequence \var{sql}. The \module{sqlite3} module also allows
|
||||
to use an iterator yielding parameters instead of a sequence.
|
||||
using an iterator yielding parameters instead of a sequence.
|
||||
|
||||
\verbatiminput{sqlite3/executemany_1.py}
|
||||
|
||||
|
|
@ -405,7 +409,7 @@ Here's a shorter example using a generator:
|
|||
\begin{methoddesc}{executescript}{sql_script}
|
||||
|
||||
This is a nonstandard convenience method for executing multiple SQL statements
|
||||
at once. It issues a COMMIT statement before, then executes the SQL script it
|
||||
at once. It issues a COMMIT statement first, then executes the SQL script it
|
||||
gets as a parameter.
|
||||
|
||||
\var{sql_script} can be a bytestring or a Unicode string.
|
||||
|
|
@ -462,20 +466,19 @@ This is how SQLite types are converted to Python types by default:
|
|||
\lineii{BLOB}{buffer}
|
||||
\end{tableii}
|
||||
|
||||
The type system of the \module{sqlite3} module is extensible in both ways: you can store
|
||||
The type system of the \module{sqlite3} module is extensible in two ways: you can store
|
||||
additional Python types in a SQLite database via object adaptation, and you can
|
||||
let the \module{sqlite3} module convert SQLite types to different Python types via
|
||||
converters.
|
||||
|
||||
\subsubsection{Using adapters to store additional Python types in SQLite databases}
|
||||
|
||||
Like described before, SQLite supports only a limited set of types natively. To
|
||||
As described before, SQLite supports only a limited set of types natively. To
|
||||
use other Python types with SQLite, you must \strong{adapt} them to one of the sqlite3
|
||||
module's supported types for SQLite. So, one of NoneType, int, long, float,
|
||||
module's supported types for SQLite: one of NoneType, int, long, float,
|
||||
str, unicode, buffer.
|
||||
|
||||
The \module{sqlite3} module uses the Python object adaptation, like described in PEP 246
|
||||
for this. The protocol to use is \class{PrepareProtocol}.
|
||||
The \module{sqlite3} module uses Python object adaptation, as described in \pep{246} for this. The protocol to use is \class{PrepareProtocol}.
|
||||
|
||||
There are two ways to enable the \module{sqlite3} module to adapt a custom Python type
|
||||
to one of the supported ones.
|
||||
|
|
@ -491,8 +494,8 @@ class Point(object):
|
|||
self.x, self.y = x, y
|
||||
\end{verbatim}
|
||||
|
||||
Now you want to store the point in a single SQLite column. You'll have to
|
||||
choose one of the supported types first that you use to represent the point in.
|
||||
Now you want to store the point in a single SQLite column. First you'll have to
|
||||
choose one of the supported types first to be used for representing the point.
|
||||
Let's just use str and separate the coordinates using a semicolon. Then you
|
||||
need to give your class a method \code{__conform__(self, protocol)} which must
|
||||
return the converted value. The parameter \var{protocol} will be
|
||||
|
|
@ -505,13 +508,13 @@ return the converted value. The parameter \var{protocol} will be
|
|||
The other possibility is to create a function that converts the type to the
|
||||
string representation and register the function with \method{register_adapter}.
|
||||
|
||||
\verbatiminput{sqlite3/adapter_point_2.py}
|
||||
|
||||
\begin{notice}
|
||||
The type/class to adapt must be a new-style class, i. e. it must have
|
||||
\class{object} as one of its bases.
|
||||
\end{notice}
|
||||
|
||||
\verbatiminput{sqlite3/adapter_point_2.py}
|
||||
|
||||
The \module{sqlite3} module has two default adapters for Python's built-in
|
||||
\class{datetime.date} and \class{datetime.datetime} types. Now let's suppose
|
||||
we want to store \class{datetime.datetime} objects not in ISO representation,
|
||||
|
|
@ -521,16 +524,17 @@ but as a \UNIX{} timestamp.
|
|||
|
||||
\subsubsection{Converting SQLite values to custom Python types}
|
||||
|
||||
Now that's all nice and dandy that you can send custom Python types to SQLite.
|
||||
Writing an adapter lets you send custom Python types to SQLite.
|
||||
But to make it really useful we need to make the Python to SQLite to Python
|
||||
roundtrip work.
|
||||
roundtrip work.
|
||||
|
||||
Enter converters.
|
||||
|
||||
Let's go back to the Point class. We stored the x and y coordinates separated
|
||||
via semicolons as strings in SQLite.
|
||||
Let's go back to the \class{Point} class. We stored the x and y
|
||||
coordinates separated via semicolons as strings in SQLite.
|
||||
|
||||
Let's first define a converter function that accepts the string as a parameter and constructs a Point object from it.
|
||||
First, we'll define a converter function that accepts the string as a
|
||||
parameter and constructs a \class{Point} object from it.
|
||||
|
||||
\begin{notice}
|
||||
Converter functions \strong{always} get called with a string, no matter
|
||||
|
|
@ -556,11 +560,12 @@ database is actually a point. There are two ways of doing this:
|
|||
\item Explicitly via the column name
|
||||
\end{itemize}
|
||||
|
||||
Both ways are described at \ref{sqlite3-Module-Contents} in the text explaining
|
||||
the constants \constant{PARSE_DECLTYPES} and \constant{PARSE_COlNAMES}.
|
||||
Both ways are described in ``Module Constants'', section~\ref{sqlite3-Module-Contents}, in
|
||||
the entries for the constants \constant{PARSE_DECLTYPES} and
|
||||
\constant{PARSE_COLNAMES}.
|
||||
|
||||
|
||||
The following example illustrates both ways.
|
||||
The following example illustrates both approaches.
|
||||
|
||||
\verbatiminput{sqlite3/converter_point.py}
|
||||
|
||||
|
|
@ -569,8 +574,8 @@ The following example illustrates both ways.
|
|||
There are default adapters for the date and datetime types in the datetime
|
||||
module. They will be sent as ISO dates/ISO timestamps to SQLite.
|
||||
|
||||
The default converters are registered under the name "date" for datetime.date
|
||||
and under the name "timestamp" for datetime.datetime.
|
||||
The default converters are registered under the name "date" for \class{datetime.date}
|
||||
and under the name "timestamp" for \class{datetime.datetime}.
|
||||
|
||||
This way, you can use date/timestamps from Python without any additional
|
||||
fiddling in most cases. The format of the adapters is also compatible with the
|
||||
|
|
@ -582,12 +587,12 @@ The following example demonstrates this.
|
|||
|
||||
\subsection{Controlling Transactions \label{sqlite3-Controlling-Transactions}}
|
||||
|
||||
By default, the \module{sqlite3} module opens transactions implicitly before a DML
|
||||
statement (INSERT/UPDATE/DELETE/REPLACE), and commits transactions implicitly
|
||||
before a non-DML, non-DQL statement (i. e. anything other than
|
||||
By default, the \module{sqlite3} module opens transactions implicitly before a Data Modification Language (DML)
|
||||
statement (i.e. INSERT/UPDATE/DELETE/REPLACE), and commits transactions implicitly
|
||||
before a non-DML, non-query statement (i. e. anything other than
|
||||
SELECT/INSERT/UPDATE/DELETE/REPLACE).
|
||||
|
||||
So if you are within a transaction, and issue a command like \code{CREATE TABLE
|
||||
So if you are within a transaction and issue a command like \code{CREATE TABLE
|
||||
...}, \code{VACUUM}, \code{PRAGMA}, the \module{sqlite3} module will commit implicitly
|
||||
before executing that command. There are two reasons for doing that. The first
|
||||
is that some of these commands don't work within transactions. The other reason
|
||||
|
|
@ -616,17 +621,17 @@ the connection yourself.
|
|||
|
||||
Using the nonstandard \method{execute}, \method{executemany} and
|
||||
\method{executescript} methods of the \class{Connection} object, your code can
|
||||
be written more concisely, because you don't have to create the - often
|
||||
superfluous \class{Cursor} objects explicitly. Instead, the \class{Cursor}
|
||||
be written more concisely because you don't have to create the (often
|
||||
superfluous) \class{Cursor} objects explicitly. Instead, the \class{Cursor}
|
||||
objects are created implicitly and these shortcut methods return the cursor
|
||||
objects. This way, you can for example execute a SELECT statement and iterate
|
||||
objects. This way, you can execute a SELECT statement and iterate
|
||||
over it directly using only a single call on the \class{Connection} object.
|
||||
|
||||
\verbatiminput{sqlite3/shortcut_methods.py}
|
||||
|
||||
\subsubsection{Accessing columns by name instead of by index}
|
||||
|
||||
One cool feature of the \module{sqlite3} module is the builtin \class{sqlite3.Row} class
|
||||
One useful feature of the \module{sqlite3} module is the builtin \class{sqlite3.Row} class
|
||||
designed to be used as a row factory.
|
||||
|
||||
Rows wrapped with this class can be accessed both by index (like tuples) and
|
||||
|
|
|
|||
|
|
@ -759,8 +759,8 @@ The original string is returned if
|
|||
Split the string at the last occurrence of \var{sep}, and return
|
||||
a 3-tuple containing the part before the separator, the separator
|
||||
itself, and the part after the separator. If the separator is not
|
||||
found, return a 3-tuple containing the string itself, followed by
|
||||
two empty strings.
|
||||
found, return a 3-tuple containing two empty strings, followed by
|
||||
the string itself.
|
||||
\versionadded{2.5}
|
||||
\end{methoddesc}
|
||||
|
||||
|
|
@ -822,7 +822,7 @@ boundaries. Line breaks are not included in the resulting list unless
|
|||
start\optional{, end}}}
|
||||
Return \code{True} if string starts with the \var{prefix}, otherwise
|
||||
return \code{False}. \var{prefix} can also be a tuple of
|
||||
suffixes to look for. With optional \var{start}, test string beginning at
|
||||
prefixes to look for. With optional \var{start}, test string beginning at
|
||||
that position. With optional \var{end}, stop comparing string at that
|
||||
position.
|
||||
|
||||
|
|
@ -864,6 +864,9 @@ optional argument \var{deletechars} are removed, and the remaining
|
|||
characters have been mapped through the given translation table, which
|
||||
must be a string of length 256.
|
||||
|
||||
You can use the \function{maketrans()} helper function in the
|
||||
\refmodule{string} module to create a translation table.
|
||||
|
||||
For Unicode objects, the \method{translate()} method does not
|
||||
accept the optional \var{deletechars} argument. Instead, it
|
||||
returns a copy of the \var{s} where all characters have been mapped
|
||||
|
|
@ -1398,21 +1401,22 @@ arbitrary objects):
|
|||
{(1)}
|
||||
\lineiii{\var{a}.clear()}{remove all items from \code{a}}{}
|
||||
\lineiii{\var{a}.copy()}{a (shallow) copy of \code{a}}{}
|
||||
\lineiii{\var{a}.has_key(\var{k})}
|
||||
\lineiii{\var{k} in \var{a}}
|
||||
{\code{True} if \var{a} has a key \var{k}, else \code{False}}
|
||||
{}
|
||||
\lineiii{\var{k} \code{in} \var{a}}
|
||||
{Equivalent to \var{a}.has_key(\var{k})}
|
||||
{(2)}
|
||||
\lineiii{\var{k} not in \var{a}}
|
||||
{Equivalent to \code{not} \var{a}.has_key(\var{k})}
|
||||
{Equivalent to \code{not} \var{k} in \var{a}}
|
||||
{(2)}
|
||||
\lineiii{\var{a}.has_key(\var{k})}
|
||||
{Equivalent to \var{k} \code{in} \var{a}, use that form in new code}
|
||||
{}
|
||||
\lineiii{\var{a}.items()}
|
||||
{a copy of \var{a}'s list of (\var{key}, \var{value}) pairs}
|
||||
{(3)}
|
||||
\lineiii{\var{a}.keys()}{a copy of \var{a}'s list of keys}{(3)}
|
||||
\lineiii{\var{a}.update(\optional{\var{b}})}
|
||||
{updates (and overwrites) key/value pairs from \var{b}}
|
||||
{updates \var{a} with key/value pairs from \var{b}, overwriting
|
||||
existing keys, returns \code{None}}
|
||||
{(9)}
|
||||
\lineiii{\var{a}.fromkeys(\var{seq}\optional{, \var{value}})}
|
||||
{Creates a new dictionary with keys from \var{seq} and values set to \var{value}}
|
||||
|
|
@ -1670,6 +1674,7 @@ flush the read-ahead buffer.
|
|||
behavior.
|
||||
|
||||
Note that not all file objects are seekable.
|
||||
\versionchanged{Passing float values as offset has been deprecated}[2.6]
|
||||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}[file]{tell}{}
|
||||
|
|
|
|||
|
|
@ -220,7 +220,7 @@ objects. They are not available as string methods.
|
|||
|
||||
\begin{funcdesc}{maketrans}{from, to}
|
||||
Return a translation table suitable for passing to
|
||||
\function{translate()} or \function{regex.compile()}, that will map
|
||||
\function{translate()}, that will map
|
||||
each character in \var{from} into the character at the same position
|
||||
in \var{to}; \var{from} and \var{to} must have the same length.
|
||||
|
||||
|
|
|
|||
|
|
@ -12,9 +12,6 @@ connect to their input/output/error pipes, and obtain their return
|
|||
codes. This module intends to replace several other, older modules
|
||||
and functions, such as:
|
||||
|
||||
% XXX Should add pointers to this module to at least the popen2
|
||||
% and commands sections.
|
||||
|
||||
\begin{verbatim}
|
||||
os.system
|
||||
os.spawn*
|
||||
|
|
|
|||
|
|
@ -86,7 +86,12 @@ If \var{prefix} is specified, the file name will begin with that
|
|||
prefix; otherwise, a default prefix is used.
|
||||
|
||||
If \var{dir} is specified, the file will be created in that directory;
|
||||
otherwise, a default directory is used.
|
||||
otherwise, a default directory is used. The default directory is chosen
|
||||
from a platform-dependent list, but the user of the application can control
|
||||
the directory location by setting the \var{TMPDIR}, \var{TEMP} or \var{TMP}
|
||||
environment variables. There is thus no guarantee that the generated
|
||||
filename will have any nice properties, such as not requiring quoting when
|
||||
passed to external commands via \code{os.popen()}.
|
||||
|
||||
If \var{text} is specified, it indicates whether to open the file in
|
||||
binary mode (the default) or text mode. On some platforms, this makes
|
||||
|
|
|
|||
|
|
@ -212,8 +212,8 @@ import unittest
|
|||
|
||||
class DefaultWidgetSizeTestCase(unittest.TestCase):
|
||||
def runTest(self):
|
||||
widget = Widget("The widget")
|
||||
self.failUnless(widget.size() == (50,50), 'incorrect default size')
|
||||
widget = Widget('The widget')
|
||||
self.assertEqual(widget.size(), (50, 50), 'incorrect default size')
|
||||
\end{verbatim}
|
||||
|
||||
Note that in order to test something, we use the one of the
|
||||
|
|
@ -247,7 +247,7 @@ import unittest
|
|||
|
||||
class SimpleWidgetTestCase(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.widget = Widget("The widget")
|
||||
self.widget = Widget('The widget')
|
||||
|
||||
class DefaultWidgetSizeTestCase(SimpleWidgetTestCase):
|
||||
def runTest(self):
|
||||
|
|
@ -273,7 +273,7 @@ import unittest
|
|||
|
||||
class SimpleWidgetTestCase(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.widget = Widget("The widget")
|
||||
self.widget = Widget('The widget')
|
||||
|
||||
def tearDown(self):
|
||||
self.widget.dispose()
|
||||
|
|
@ -298,7 +298,7 @@ import unittest
|
|||
|
||||
class WidgetTestCase(unittest.TestCase):
|
||||
def setUp(self):
|
||||
self.widget = Widget("The widget")
|
||||
self.widget = Widget('The widget')
|
||||
|
||||
def tearDown(self):
|
||||
self.widget.dispose()
|
||||
|
|
@ -322,8 +322,8 @@ instance we must specify the test method it is to run. We do this by
|
|||
passing the method name in the constructor:
|
||||
|
||||
\begin{verbatim}
|
||||
defaultSizeTestCase = WidgetTestCase("testDefaultSize")
|
||||
resizeTestCase = WidgetTestCase("testResize")
|
||||
defaultSizeTestCase = WidgetTestCase('testDefaultSize')
|
||||
resizeTestCase = WidgetTestCase('testResize')
|
||||
\end{verbatim}
|
||||
|
||||
Test case instances are grouped together according to the features
|
||||
|
|
@ -333,8 +333,8 @@ class:
|
|||
|
||||
\begin{verbatim}
|
||||
widgetTestSuite = unittest.TestSuite()
|
||||
widgetTestSuite.addTest(WidgetTestCase("testDefaultSize"))
|
||||
widgetTestSuite.addTest(WidgetTestCase("testResize"))
|
||||
widgetTestSuite.addTest(WidgetTestCase('testDefaultSize'))
|
||||
widgetTestSuite.addTest(WidgetTestCase('testResize'))
|
||||
\end{verbatim}
|
||||
|
||||
For the ease of running tests, as we will see later, it is a good
|
||||
|
|
@ -344,8 +344,8 @@ pre-built test suite:
|
|||
\begin{verbatim}
|
||||
def suite():
|
||||
suite = unittest.TestSuite()
|
||||
suite.addTest(WidgetTestCase("testDefaultSize"))
|
||||
suite.addTest(WidgetTestCase("testResize"))
|
||||
suite.addTest(WidgetTestCase('testDefaultSize'))
|
||||
suite.addTest(WidgetTestCase('testResize'))
|
||||
return suite
|
||||
\end{verbatim}
|
||||
|
||||
|
|
@ -353,7 +353,7 @@ or even:
|
|||
|
||||
\begin{verbatim}
|
||||
def suite():
|
||||
tests = ["testDefaultSize", "testResize"]
|
||||
tests = ['testDefaultSize', 'testResize']
|
||||
|
||||
return unittest.TestSuite(map(WidgetTestCase, tests))
|
||||
\end{verbatim}
|
||||
|
|
@ -462,7 +462,7 @@ easier.}
|
|||
\subsection{Classes and functions
|
||||
\label{unittest-contents}}
|
||||
|
||||
\begin{classdesc}{TestCase}{}
|
||||
\begin{classdesc}{TestCase}{\optional{methodName}}
|
||||
Instances of the \class{TestCase} class represent the smallest
|
||||
testable units in the \module{unittest} universe. This class is
|
||||
intended to be used as a base class, with specific tests being
|
||||
|
|
@ -470,6 +470,23 @@ easier.}
|
|||
interface needed by the test runner to allow it to drive the
|
||||
test, and methods that the test code can use to check for and
|
||||
report various kinds of failure.
|
||||
|
||||
Each instance of \class{TestCase} will run a single test method:
|
||||
the method named \var{methodName}. If you remember, we had an
|
||||
earlier example that went something like this:
|
||||
|
||||
\begin{verbatim}
|
||||
def suite():
|
||||
suite = unittest.TestSuite()
|
||||
suite.addTest(WidgetTestCase('testDefaultSize'))
|
||||
suite.addTest(WidgetTestCase('testResize'))
|
||||
return suite
|
||||
\end{verbatim}
|
||||
|
||||
Here, we create two instances of \class{WidgetTestCase}, each of
|
||||
which runs a single test.
|
||||
|
||||
\var{methodName} defaults to \code{'runTest'}.
|
||||
\end{classdesc}
|
||||
|
||||
\begin{classdesc}{FunctionTestCase}{testFunc\optional{,
|
||||
|
|
@ -502,6 +519,11 @@ easier.}
|
|||
subclass.
|
||||
\end{classdesc}
|
||||
|
||||
\begin{classdesc}{TestResult}{}
|
||||
This class is used to compile information about which tests have succeeded
|
||||
and which have failed.
|
||||
\end{classdesc}
|
||||
|
||||
\begin{datadesc}{defaultTestLoader}
|
||||
Instance of the \class{TestLoader} class intended to be shared. If no
|
||||
customization of the \class{TestLoader} is needed, this instance can
|
||||
|
|
@ -574,8 +596,9 @@ Methods in the first group (running the test) are:
|
|||
\begin{methoddesc}[TestCase]{run}{\optional{result}}
|
||||
Run the test, collecting the result into the test result object
|
||||
passed as \var{result}. If \var{result} is omitted or \constant{None},
|
||||
a temporary result object is created and used, but is not made
|
||||
available to the caller.
|
||||
a temporary result object is created (by calling the
|
||||
\method{defaultTestCase()} method) and used; this result object is not
|
||||
returned to \method{run()}'s caller.
|
||||
|
||||
The same effect may be had by simply calling the \class{TestCase}
|
||||
instance.
|
||||
|
|
@ -684,8 +707,13 @@ information on the test:
|
|||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}[TestCase]{defaultTestResult}{}
|
||||
Return the default type of test result object to be used to run this
|
||||
test.
|
||||
Return an instance of the test result class that should be used
|
||||
for this test case class (if no other result instance is provided
|
||||
to the \method{run()} method).
|
||||
|
||||
For \class{TestCase} instances, this will always be an instance of
|
||||
\class{TestResult}; subclasses of \class{TestCase} should
|
||||
override this as necessary.
|
||||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}[TestCase]{id}{}
|
||||
|
|
@ -761,26 +789,20 @@ access to the \class{TestResult} object generated by running a set of
|
|||
tests for reporting purposes; a \class{TestResult} instance is
|
||||
returned by the \method{TestRunner.run()} method for this purpose.
|
||||
|
||||
Each instance holds the total number of tests run, and collections of
|
||||
failures and errors that occurred among those test runs. The
|
||||
collections contain tuples of \code{(\var{testcase},
|
||||
\var{traceback})}, where \var{traceback} is a string containing a
|
||||
formatted version of the traceback for the exception.
|
||||
|
||||
\class{TestResult} instances have the following attributes that will
|
||||
be of interest when inspecting the results of running a set of tests:
|
||||
|
||||
\begin{memberdesc}[TestResult]{errors}
|
||||
A list containing 2-tuples of \class{TestCase} instances and
|
||||
formatted tracebacks. Each tuple represents a test which raised an
|
||||
unexpected exception.
|
||||
strings holding formatted tracebacks. Each tuple represents a test which
|
||||
raised an unexpected exception.
|
||||
\versionchanged[Contains formatted tracebacks instead of
|
||||
\function{sys.exc_info()} results]{2.2}
|
||||
\end{memberdesc}
|
||||
|
||||
\begin{memberdesc}[TestResult]{failures}
|
||||
A list containing 2-tuples of \class{TestCase} instances and
|
||||
formatted tracebacks. Each tuple represents a test where a failure
|
||||
A list containing 2-tuples of \class{TestCase} instances and strings
|
||||
holding formatted tracebacks. Each tuple represents a test where a failure
|
||||
was explicitly signalled using the \method{TestCase.fail*()} or
|
||||
\method{TestCase.assert*()} methods.
|
||||
\versionchanged[Contains formatted tracebacks instead of
|
||||
|
|
@ -817,17 +839,25 @@ reporting while tests are being run.
|
|||
|
||||
\begin{methoddesc}[TestResult]{startTest}{test}
|
||||
Called when the test case \var{test} is about to be run.
|
||||
|
||||
The default implementation simply increments the instance's
|
||||
\code{testsRun} counter.
|
||||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}[TestResult]{stopTest}{test}
|
||||
Called when the test case \var{test} has been executed, regardless
|
||||
Called after the test case \var{test} has been executed, regardless
|
||||
of the outcome.
|
||||
|
||||
The default implementation does nothing.
|
||||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}[TestResult]{addError}{test, err}
|
||||
Called when the test case \var{test} raises an unexpected exception
|
||||
\var{err} is a tuple of the form returned by \function{sys.exc_info()}:
|
||||
\code{(\var{type}, \var{value}, \var{traceback})}.
|
||||
|
||||
The default implementation appends \code{(\var{test}, \var{err})} to
|
||||
the instance's \code{errors} attribute.
|
||||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}[TestResult]{addFailure}{test, err}
|
||||
|
|
@ -835,10 +865,15 @@ reporting while tests are being run.
|
|||
\var{err} is a tuple of the form returned by
|
||||
\function{sys.exc_info()}: \code{(\var{type}, \var{value},
|
||||
\var{traceback})}.
|
||||
|
||||
The default implementation appends \code{(\var{test}, \var{err})} to
|
||||
the instance's \code{failures} attribute.
|
||||
\end{methoddesc}
|
||||
|
||||
\begin{methoddesc}[TestResult]{addSuccess}{test}
|
||||
Called when the test case \var{test} succeeds.
|
||||
|
||||
The default implementation does nothing.
|
||||
\end{methoddesc}
|
||||
|
||||
|
||||
|
|
@ -878,9 +913,12 @@ configurable properties.
|
|||
Return a suite of all tests cases given a string specifier.
|
||||
|
||||
The specifier \var{name} is a ``dotted name'' that may resolve
|
||||
either to a module, a test case class, a \class{TestSuite} instance,
|
||||
a test method within a test case class, or a callable object which
|
||||
returns a \class{TestCase} or \class{TestSuite} instance.
|
||||
either to a module, a test case class, a test method within a test
|
||||
case class, a \class{TestSuite} instance, or a callable object which
|
||||
returns a \class{TestCase} or \class{TestSuite} instance. These checks
|
||||
are applied in the order listed here; that is, a method on a possible
|
||||
test case class will be picked up as ``a test method within a test
|
||||
case class'', rather than ``a callable object''.
|
||||
|
||||
For example, if you have a module \module{SampleTests} containing a
|
||||
\class{TestCase}-derived class \class{SampleTestCase} with three test
|
||||
|
|
@ -905,7 +943,7 @@ configurable properties.
|
|||
|
||||
\begin{methoddesc}[TestLoader]{getTestCaseNames}{testCaseClass}
|
||||
Return a sorted sequence of method names found within
|
||||
\var{testCaseClass}.
|
||||
\var{testCaseClass}; this should be a subclass of \class{TestCase}.
|
||||
\end{methoddesc}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ a ? with an empty query; the RFC states that these are equivalent).
|
|||
|
||||
\begin{funcdesc}{urljoin}{base, url\optional{, allow_fragments}}
|
||||
Construct a full (``absolute'') URL by combining a ``base URL''
|
||||
(\var{base}) with a ``relative URL'' (\var{url}). Informally, this
|
||||
(\var{base}) with another URL (\var{url}). Informally, this
|
||||
uses components of the base URL, in particular the addressing scheme,
|
||||
the network location and (part of) the path, to provide missing
|
||||
components in the relative URL. For example:
|
||||
|
|
@ -155,6 +155,20 @@ components in the relative URL. For example:
|
|||
|
||||
The \var{allow_fragments} argument has the same meaning and default as
|
||||
for \function{urlparse()}.
|
||||
|
||||
\note{If \var{url} is an absolute URL (that is, starting with \code{//}
|
||||
or \code{scheme://}, the \var{url}'s host name and/or scheme
|
||||
will be present in the result. For example:}
|
||||
|
||||
\begin{verbatim}
|
||||
>>> urljoin('http://www.cwi.nl/%7Eguido/Python.html',
|
||||
... '//www.python.org/%7Eguido')
|
||||
'http://www.python.org/%7Eguido'
|
||||
\end{verbatim}
|
||||
|
||||
If you do not want that behavior, preprocess
|
||||
the \var{url} with \function{urlsplit()} and \function{urlunsplit()},
|
||||
removing possible \em{scheme} and \em{netloc} parts.
|
||||
\end{funcdesc}
|
||||
|
||||
\begin{funcdesc}{urldefrag}{url}
|
||||
|
|
|
|||
|
|
@ -18,20 +18,11 @@ may compromise privacy since it creates a UUID containing the computer's
|
|||
network address. \function{uuid4()} creates a random UUID.
|
||||
|
||||
\begin{classdesc}{UUID}{\optional{hex\optional{, bytes\optional{,
|
||||
fields\optional{, int\optional{, version}}}}}}
|
||||
|
||||
%Instances of the UUID class represent UUIDs as specified in RFC 4122.
|
||||
%UUID objects are immutable, hashable, and usable as dictionary keys.
|
||||
%Converting a UUID to a string with str() yields something in the form
|
||||
%'12345678-1234-1234-1234-123456789abc'. The UUID constructor accepts
|
||||
%four possible forms: a similar string of hexadecimal digits, or a
|
||||
%string of 16 raw bytes as an argument named 'bytes', or a tuple of
|
||||
%six integer fields (with 32-bit, 16-bit, 16-bit, 8-bit, 8-bit, and
|
||||
%48-bit values respectively) as an argument named 'fields', or a single
|
||||
%128-bit integer as an argument named 'int'.
|
||||
bytes_le\optional{, fields\optional{, int\optional{, version}}}}}}}
|
||||
|
||||
Create a UUID from either a string of 32 hexadecimal digits,
|
||||
a string of 16 bytes as the \var{bytes} argument, a tuple of six
|
||||
a string of 16 bytes as the \var{bytes} argument, a string of 16 bytes
|
||||
in little-endian order as the \var{bytes_le} argument, a tuple of six
|
||||
integers (32-bit \var{time_low}, 16-bit \var{time_mid},
|
||||
16-bit \var{time_hi_version},
|
||||
8-bit \var{clock_seq_hi_variant}, 8-bit \var{clock_seq_low}, 48-bit \var{node})
|
||||
|
|
@ -45,22 +36,31 @@ UUID('{12345678-1234-5678-1234-567812345678}')
|
|||
UUID('12345678123456781234567812345678')
|
||||
UUID('urn:uuid:12345678-1234-5678-1234-567812345678')
|
||||
UUID(bytes='\x12\x34\x56\x78'*4)
|
||||
UUID(bytes_le='\x78\x56\x34\x12\x34\x12\x78\x56' +
|
||||
'\x12\x34\x56\x78\x12\x34\x56\x78')
|
||||
UUID(fields=(0x12345678, 0x1234, 0x5678, 0x12, 0x34, 0x567812345678))
|
||||
UUID(int=0x12345678123456781234567812345678)
|
||||
\end{verbatim}
|
||||
|
||||
Exactly one of \var{hex}, \var{bytes}, \var{fields}, or \var{int} must
|
||||
Exactly one of \var{hex}, \var{bytes}, \var{bytes_le}, \var{fields},
|
||||
or \var{int} must
|
||||
be given. The \var{version} argument is optional; if given, the
|
||||
resulting UUID will have its variant and version number set according to
|
||||
RFC 4122, overriding bits in the given \var{hex}, \var{bytes},
|
||||
\var{fields}, or \var{int}.
|
||||
\var{bytes_le}, \var{fields}, or \var{int}.
|
||||
|
||||
\end{classdesc}
|
||||
|
||||
\class{UUID} instances have these read-only attributes:
|
||||
|
||||
\begin{memberdesc}{bytes}
|
||||
The UUID as a 16-byte string.
|
||||
The UUID as a 16-byte string (containing the six
|
||||
integer fields in big-endian byte order).
|
||||
\end{memberdesc}
|
||||
|
||||
\begin{memberdesc}{bytes_le}
|
||||
The UUID as a 16-byte string (with \var{time_low}, \var{time_mid},
|
||||
and \var{time_hi_version} in little-endian byte order).
|
||||
\end{memberdesc}
|
||||
|
||||
\begin{memberdesc}{fields}
|
||||
|
|
@ -95,10 +95,10 @@ The UUID as a URN as specified in RFC 4122.
|
|||
|
||||
\begin{memberdesc}{variant}
|
||||
The UUID variant, which determines the internal layout of the UUID.
|
||||
This will be an integer equal to one of the constants
|
||||
This will be one of the integer constants
|
||||
\constant{RESERVED_NCS},
|
||||
\constant{RFC_4122}, \constant{RESERVED_MICROSOFT}, or
|
||||
\constant{RESERVED_FUTURE}).
|
||||
\constant{RESERVED_FUTURE}.
|
||||
\end{memberdesc}
|
||||
|
||||
\begin{memberdesc}{version}
|
||||
|
|
@ -106,7 +106,7 @@ The UUID version number (1 through 5, meaningful only
|
|||
when the variant is \constant{RFC_4122}).
|
||||
\end{memberdesc}
|
||||
|
||||
The \module{uuid} module defines the following functions
|
||||
The \module{uuid} module defines the following functions:
|
||||
|
||||
\begin{funcdesc}{getnode}{}
|
||||
Get the hardware address as a 48-bit positive integer. The first time this
|
||||
|
|
@ -129,11 +129,8 @@ otherwise a random 14-bit sequence number is chosen.
|
|||
\index{uuid1}
|
||||
|
||||
\begin{funcdesc}{uuid3}{namespace, name}
|
||||
Generate a UUID based upon a MD5 hash of the \var{name} string value
|
||||
drawn from a specified namespace. \var{namespace}
|
||||
must be one of \constant{NAMESPACE_DNS},
|
||||
\constant{NAMESPACE_URL}, \constant{NAMESPACE_OID},
|
||||
or \constant{NAMESPACE_X500}.
|
||||
Generate a UUID based on the MD5 hash
|
||||
of a namespace identifier (which is a UUID) and a name (which is a string).
|
||||
\end{funcdesc}
|
||||
\index{uuid3}
|
||||
|
||||
|
|
@ -143,31 +140,32 @@ Generate a random UUID.
|
|||
\index{uuid4}
|
||||
|
||||
\begin{funcdesc}{uuid5}{namespace, name}
|
||||
Generate a UUID based upon a SHA-1 hash of the \var{name} string value
|
||||
drawn from a specified namespace. \var{namespace}
|
||||
must be one of \constant{NAMESPACE_DNS},
|
||||
\constant{NAMESPACE_URL}, \constant{NAMESPACE_OID},
|
||||
or \constant{NAMESPACE_X500}.
|
||||
Generate a UUID based on the SHA-1 hash
|
||||
of a namespace identifier (which is a UUID) and a name (which is a string).
|
||||
\end{funcdesc}
|
||||
\index{uuid5}
|
||||
|
||||
The \module{uuid} module defines the following namespace constants
|
||||
The \module{uuid} module defines the following namespace identifiers
|
||||
for use with \function{uuid3()} or \function{uuid5()}.
|
||||
|
||||
\begin{datadesc}{NAMESPACE_DNS}
|
||||
Fully-qualified domain name namespace UUID.
|
||||
When this namespace is specified,
|
||||
the \var{name} string is a fully-qualified domain name.
|
||||
\end{datadesc}
|
||||
|
||||
\begin{datadesc}{NAMESPACE_URL}
|
||||
URL namespace UUID.
|
||||
When this namespace is specified,
|
||||
the \var{name} string is a URL.
|
||||
\end{datadesc}
|
||||
|
||||
\begin{datadesc}{NAMESPACE_OID}
|
||||
ISO OID namespace UUID.
|
||||
When this namespace is specified,
|
||||
the \var{name} string is an ISO OID.
|
||||
\end{datadesc}
|
||||
|
||||
\begin{datadesc}{NAMESPACE_X500}
|
||||
X.500 DN namespace UUID.
|
||||
When this namespace is specified,
|
||||
the \var{name} string is an X.500 DN in DER or a text output format.
|
||||
\end{datadesc}
|
||||
|
||||
The \module{uuid} module defines the following constants
|
||||
|
|
@ -178,11 +176,11 @@ Reserved for NCS compatibility.
|
|||
\end{datadesc}
|
||||
|
||||
\begin{datadesc}{RFC_4122}
|
||||
Uses UUID layout specified in \rfc{4122}.
|
||||
Specifies the UUID layout given in \rfc{4122}.
|
||||
\end{datadesc}
|
||||
|
||||
\begin{datadesc}{RESERVED_MICROSOFT}
|
||||
Reserved for Microsoft backward compatibility.
|
||||
Reserved for Microsoft compatibility.
|
||||
\end{datadesc}
|
||||
|
||||
\begin{datadesc}{RESERVED_FUTURE}
|
||||
|
|
@ -192,12 +190,13 @@ Reserved for future definition.
|
|||
|
||||
\begin{seealso}
|
||||
\seerfc{4122}{A Universally Unique IDentifier (UUID) URN Namespace}{
|
||||
This specifies a Uniform Resource Name namespace for UUIDs.}
|
||||
This specification defines a Uniform Resource Name namespace for UUIDs,
|
||||
the internal format of UUIDs, and methods of generating UUIDs.}
|
||||
\end{seealso}
|
||||
|
||||
\subsection{Example \label{uuid-example}}
|
||||
|
||||
Here is a typical usage:
|
||||
Here are some examples of typical usage of the \module{uuid} module:
|
||||
\begin{verbatim}
|
||||
>>> import uuid
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,9 @@ checks WSGI servers and applications for conformance to the
|
|||
WSGI specification (\pep{333}).
|
||||
|
||||
% XXX If you're just trying to write a web application...
|
||||
% XXX should create a URL on python.org to point people to.
|
||||
|
||||
See \url{http://www.wsgi.org} for more information about WSGI,
|
||||
and links to tutorials and other resources.
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -68,7 +68,10 @@ Python type):
|
|||
\lineii{arrays}{Any Python sequence type containing conformable
|
||||
elements. Arrays are returned as lists}
|
||||
\lineii{structures}{A Python dictionary. Keys must be strings,
|
||||
values may be any conformable type.}
|
||||
values may be any conformable type. Objects
|
||||
of user-defined classes can be passed in;
|
||||
only their \var{__dict__} attribute is
|
||||
transmitted.}
|
||||
\lineii{dates}{in seconds since the epoch (pass in an instance of the
|
||||
\class{DateTime} class) or a
|
||||
\class{\refmodule{datetime}.datetime},
|
||||
|
|
@ -100,6 +103,10 @@ described below.
|
|||
compatibility. New code should use \class{ServerProxy}.
|
||||
|
||||
\versionchanged[The \var{use_datetime} flag was added]{2.5}
|
||||
|
||||
\versionchanged[Instances of new-style classes can be passed in
|
||||
if they have an \var{__dict__} attribute and don't have a base class
|
||||
that is marshalled in a special way]{2.6}
|
||||
\end{classdesc}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ cur.executescript("""
|
|||
|
||||
insert into book(title, author, published)
|
||||
values (
|
||||
'Dirk Gently''s Holistic Detective Agency
|
||||
'Dirk Gently''s Holistic Detective Agency',
|
||||
'Douglas Adams',
|
||||
1987
|
||||
);
|
||||
|
|
|
|||
|
|
@ -318,7 +318,7 @@ the name of a widget.
|
|||
\item[\var{options}]
|
||||
configure the widget's appearance and in some cases, its
|
||||
behavior. The options come in the form of a list of flags and values.
|
||||
Flags are proceeded by a `-', like \UNIX{} shell command flags, and
|
||||
Flags are preceded by a `-', like \UNIX{} shell command flags, and
|
||||
values are put in quotes if they are more than one word.
|
||||
\end{description}
|
||||
|
||||
|
|
|
|||
|
|
@ -883,6 +883,12 @@ sub process_grammar_files(){
|
|||
$filename = 'grammar.txt';
|
||||
}
|
||||
open(GRAMMAR, ">$filename") || die "\n$!\n";
|
||||
print GRAMMAR "##################################################\n";
|
||||
print GRAMMAR "# This file is only meant to be a guide, #\n";
|
||||
print GRAMMAR "# and differs in small ways from the real #\n";
|
||||
print GRAMMAR "# grammar. The exact reference is the file #\n";
|
||||
print GRAMMAR "# Grammar/Grammar distributed with the source. #\n";
|
||||
print GRAMMAR "##################################################\n";
|
||||
print GRAMMAR strip_grammar_markup($DefinedGrammars{$lang});
|
||||
close(GRAMMAR);
|
||||
print "Wrote grammar file $filename\n";
|
||||
|
|
|
|||
|
|
@ -378,6 +378,41 @@ additional example of a mutable sequence type.
|
|||
|
||||
\end{description} % Sequences
|
||||
|
||||
|
||||
\item[Set types]
|
||||
These represent unordered, finite sets of unique, immutable objects.
|
||||
As such, they cannot be indexed by any subscript. However, they can be
|
||||
iterated over, and the built-in function \function{len()} returns the
|
||||
number of items in a set. Common uses for sets are
|
||||
fast membership testing, removing duplicates from a sequence, and
|
||||
computing mathematical operations such as intersection, union, difference,
|
||||
and symmetric difference.
|
||||
\bifuncindex{len}
|
||||
\obindex{set type}
|
||||
|
||||
For set elements, the same immutability rules apply as for dictionary
|
||||
keys. Note that numeric types obey the normal rules for numeric
|
||||
comparison: if two numbers compare equal (e.g., \code{1} and
|
||||
\code{1.0}), only one of them can be contained in a set.
|
||||
|
||||
There are currently two intrinsic set types:
|
||||
|
||||
\begin{description}
|
||||
|
||||
\item[Sets]
|
||||
These\obindex{set} represent a mutable set. They are created by the
|
||||
built-in \function{set()} constructor and can be modified afterwards
|
||||
by several methods, such as \method{add()}.
|
||||
|
||||
\item[Frozen sets]
|
||||
These\obindex{frozenset} represent an immutable set. They are created by
|
||||
the built-in \function{frozenset()} constructor. As a frozenset is
|
||||
immutable and hashable, it can be used again as an element of another set,
|
||||
or as a dictionary key.
|
||||
|
||||
\end{description} % Set types
|
||||
|
||||
|
||||
\item[Mappings]
|
||||
These represent finite sets of objects indexed by arbitrary index sets.
|
||||
The subscript notation \code{a[k]} selects the item indexed
|
||||
|
|
@ -761,7 +796,7 @@ user-defined method object whose associated class is the class
|
|||
(call it~\class{C}) of the instance for which the attribute reference
|
||||
was initiated or one of its bases,
|
||||
it is transformed into a bound user-defined method object whose
|
||||
\member{im_class} attribute is~\class{C} whose \member{im_self} attribute
|
||||
\member{im_class} attribute is~\class{C} and whose \member{im_self} attribute
|
||||
is the instance. Static method and class method objects are also
|
||||
transformed, as if they had been retrieved from class~\class{C};
|
||||
see above under ``Classes''. See section~\ref{descriptors} for
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
;;; py2texi.el -- Conversion of Python LaTeX documentation to Texinfo
|
||||
|
||||
;; Copyright (C) 2006 Jeroen Dekkers <jeroen@dekkers.cx>
|
||||
;; Copyright (C) 1998, 1999, 2001, 2002 Milan Zamazal
|
||||
|
||||
;; Author: Milan Zamazal <pdm@zamazal.org>
|
||||
|
|
@ -168,6 +169,7 @@ Otherwise a generated Info file name is used.")
|
|||
"@end table\n")
|
||||
("productionlist" 0 "\n@table @code\n" "@end table\n")
|
||||
("quotation" 0 "@quotation" "@end quotation")
|
||||
("quote" 0 "@quotation" "@end quotation")
|
||||
("seealso" 0 "See also:\n@table @emph\n" "@end table\n")
|
||||
("seealso*" 0 "@table @emph\n" "@end table\n")
|
||||
("sloppypar" 0 "" "")
|
||||
|
|
@ -246,11 +248,12 @@ Both BEGIN and END are evaled. Moreover, you can reference arguments through
|
|||
("env" 1 "@code{\\1}")
|
||||
("EOF" 0 "@code{EOF}")
|
||||
("email" 1 "@email{\\1}")
|
||||
("em" 1 "@emph{\\1}")
|
||||
("emph" 1 "@emph{\\1}")
|
||||
("envvar" 1 "@env{\\1}")
|
||||
("exception" 1 "@code{\\1}")
|
||||
("exindex" 1 (progn (setq obindex t) "@obindex{\\1}"))
|
||||
("fi" 0 (concat "@end " last-if))
|
||||
("fi" 0 (if (equal last-if "ifx") "" (concat "@end " last-if)))
|
||||
("file" 1 "@file{\\1}")
|
||||
("filenq" 1 "@file{\\1}")
|
||||
("filevar" 1 "@file{@var{\\1}}")
|
||||
|
|
@ -262,6 +265,7 @@ Both BEGIN and END are evaled. Moreover, you can reference arguments through
|
|||
("grammartoken" 1 "@code{\\1}")
|
||||
("guilabel" 1 "@strong{\\1}")
|
||||
("hline" 0 "")
|
||||
("ifx" 0 (progn (setq last-if "ifx") ""))
|
||||
("ifhtml" 0 (concat "@" (setq last-if "ifinfo")))
|
||||
("iftexi" 0 (concat "@" (setq last-if "ifinfo")))
|
||||
("index" 1 (progn (setq cindex t) "@cindex{\\1}"))
|
||||
|
|
@ -284,6 +288,7 @@ Both BEGIN and END are evaled. Moreover, you can reference arguments through
|
|||
("lineiii" 3 "@item \\1 @tab \\2 @tab \\3")
|
||||
("lineiv" 4 "@item \\1 @tab \\2 @tab \\3 @tab \\4")
|
||||
("linev" 5 "@item \\1 @tab \\2 @tab \\3 @tab \\4 @tab \\5")
|
||||
("locallinewidth" 0 "")
|
||||
("localmoduletable" 0 "")
|
||||
("longprogramopt" 1 "@option{--\\1}")
|
||||
("macro" 1 "@code{@backslash{}\\1}")
|
||||
|
|
@ -307,6 +312,7 @@ Both BEGIN and END are evaled. Moreover, you can reference arguments through
|
|||
("moreargs" 0 "@dots{}")
|
||||
("n" 0 "@backslash{}n")
|
||||
("newcommand" 2 "")
|
||||
("newlength" 1 "")
|
||||
("newsgroup" 1 "@samp{\\1}")
|
||||
("nodename" 1
|
||||
(save-excursion
|
||||
|
|
@ -322,6 +328,7 @@ Both BEGIN and END are evaled. Moreover, you can reference arguments through
|
|||
("opindex" 1 (progn (setq cindex t) "@cindex{\\1}"))
|
||||
("option" 1 "@option{\\1}")
|
||||
("optional" 1 "[\\1]")
|
||||
("paragraph" 1 "@subsubheading \\1")
|
||||
("pep" 1 (progn (setq cindex t) "PEP@ \\1@cindex PEP \\1\n"))
|
||||
("pi" 0 "pi")
|
||||
("platform" 1 "")
|
||||
|
|
@ -363,6 +370,7 @@ Both BEGIN and END are evaled. Moreover, you can reference arguments through
|
|||
("seetitle" 1 "@cite{\\1}")
|
||||
("seeurl" 2 "\n@table @url\n@item \\1\n\\2\n@end table\n")
|
||||
("setindexsubitem" 1 (progn (setq cindex t) "@cindex \\1"))
|
||||
("setlength" 2 "")
|
||||
("setreleaseinfo" 1 (progn (setq py2texi-releaseinfo "")))
|
||||
("setshortversion" 1
|
||||
(progn (setq py2texi-python-short-version (match-string 1 string)) ""))
|
||||
|
|
@ -382,8 +390,8 @@ Both BEGIN and END are evaled. Moreover, you can reference arguments through
|
|||
("textasciicircum" 0 "^")
|
||||
("textbackslash" 0 "@backslash{}")
|
||||
("textbar" 0 "|")
|
||||
; Some common versions of Texinfo don't support @euro yet:
|
||||
; ("texteuro" 0 "@euro{}")
|
||||
("textbf" 1 "@strong{\\1}")
|
||||
("texteuro" 0 "@euro{}")
|
||||
; Unfortunately, this alternate spelling doesn't actually apply to
|
||||
; the usage found in Python Tutorial, which actually requires a
|
||||
; Euro symbol to make sense, so this is commented out as well.
|
||||
|
|
@ -394,6 +402,7 @@ Both BEGIN and END are evaled. Moreover, you can reference arguments through
|
|||
("textrm" 1 "\\1")
|
||||
("texttt" 1 "@code{\\1}")
|
||||
("textunderscore" 0 "_")
|
||||
("tilde" 0 "~")
|
||||
("title" 1 (progn (setq title (match-string 1 string)) "@settitle \\1"))
|
||||
("today" 0 "@today{}")
|
||||
("token" 1 "@code{\\1}")
|
||||
|
|
@ -402,6 +411,7 @@ Both BEGIN and END are evaled. Moreover, you can reference arguments through
|
|||
("u" 0 "@backslash{}u")
|
||||
("ulink" 2 "\\1")
|
||||
("UNIX" 0 "UNIX")
|
||||
("undefined" 0 "")
|
||||
("unspecified" 0 "@dots{}")
|
||||
("url" 1 "@url{\\1}")
|
||||
("usepackage" 1 "")
|
||||
|
|
@ -534,15 +544,20 @@ Each list item is of the form (COMMAND ARGNUM SUBSTITUTION) where:
|
|||
beg
|
||||
end)
|
||||
(py2texi-search-safe "\\\\begin{\\(verbatim\\|displaymath\\)}"
|
||||
(replace-match "@example")
|
||||
(setq beg (copy-marker (point) nil))
|
||||
(re-search-forward "\\\\end{\\(verbatim\\|displaymath\\)}")
|
||||
(setq end (copy-marker (match-beginning 0) nil))
|
||||
(replace-match "@end example")
|
||||
(py2texi-texinfo-escape beg end)
|
||||
(put-text-property (- beg (length "@example"))
|
||||
(+ end (length "@end example"))
|
||||
'py2texi-protected t))
|
||||
(when (save-excursion
|
||||
; Make sure we aren't looking at a commented out version
|
||||
; of a verbatim environment
|
||||
(beginning-of-line)
|
||||
(not (looking-at "%")))
|
||||
(replace-match "@example ")
|
||||
(setq beg (copy-marker (point) nil))
|
||||
(re-search-forward "\\\\end{\\(verbatim\\|displaymath\\)}")
|
||||
(setq end (copy-marker (match-beginning 0) nil))
|
||||
(replace-match "@end example")
|
||||
(py2texi-texinfo-escape beg end)
|
||||
(put-text-property (- beg (length "@example "))
|
||||
(+ end (length "@end example"))
|
||||
'py2texi-protected t)))
|
||||
(py2texi-search-safe "\\\\verb\\([^a-z]\\)"
|
||||
(setq delimiter (match-string 1))
|
||||
(replace-match "@code{")
|
||||
|
|
@ -883,6 +898,10 @@ Do not include .ind files."
|
|||
|
||||
(defun py2texi-fix-braces ()
|
||||
"Escape braces for Texinfo."
|
||||
(py2texi-search "{@{}"
|
||||
(replace-match "@{"))
|
||||
(py2texi-search "{@}}"
|
||||
(replace-match "@}"))
|
||||
(let (string)
|
||||
(py2texi-search "{"
|
||||
(unless (or (py2texi-protected)
|
||||
|
|
|
|||
|
|
@ -2831,7 +2831,7 @@ Now what happens when the user writes \code{from Sound.Effects import
|
|||
*}? Ideally, one would hope that this somehow goes out to the
|
||||
filesystem, finds which submodules are present in the package, and
|
||||
imports them all. Unfortunately, this operation does not work very
|
||||
well on Mac and Windows platforms, where the filesystem does not
|
||||
well on Windows platforms, where the filesystem does not
|
||||
always have accurate information about the case of a filename! On
|
||||
these platforms, there is no guaranteed way to know whether a file
|
||||
\file{ECHO.PY} should be imported as a module \module{echo},
|
||||
|
|
@ -3036,6 +3036,7 @@ Here are two ways to write a table of squares and cubes:
|
|||
8 64 512
|
||||
9 81 729
|
||||
10 100 1000
|
||||
|
||||
>>> for x in range(1,11):
|
||||
... print '%2d %3d %4d' % (x, x*x, x*x*x)
|
||||
...
|
||||
|
|
@ -3051,8 +3052,9 @@ Here are two ways to write a table of squares and cubes:
|
|||
10 100 1000
|
||||
\end{verbatim}
|
||||
|
||||
(Note that one space between each column was added by the way
|
||||
\keyword{print} works: it always adds spaces between its arguments.)
|
||||
(Note that in the first example, one space between each column was
|
||||
added by the way \keyword{print} works: it always adds spaces between
|
||||
its arguments.)
|
||||
|
||||
This example demonstrates the \method{rjust()} method of string objects,
|
||||
which right-justifies a string in a field of a given width by padding
|
||||
|
|
@ -3521,7 +3523,7 @@ be accessed or printed directly without having to reference \code{.args}.
|
|||
|
||||
But use of \code{.args} is discouraged. Instead, the preferred use is to pass
|
||||
a single argument to an exception (which can be a tuple if multiple arguments
|
||||
are needed) and have it bound to the \code{message} attribute. One my also
|
||||
are needed) and have it bound to the \code{message} attribute. One may also
|
||||
instantiate an exception first before raising it and add any attributes to it
|
||||
as desired.
|
||||
|
||||
|
|
|
|||
|
|
@ -409,7 +409,7 @@ is always executed, or one or more \keyword{except} blocks to catch
|
|||
specific exceptions. You couldn't combine both \keyword{except} blocks and a
|
||||
\keyword{finally} block, because generating the right bytecode for the
|
||||
combined version was complicated and it wasn't clear what the
|
||||
semantics of the combined should be.
|
||||
semantics of the combined statement should be.
|
||||
|
||||
Guido van~Rossum spent some time working with Java, which does support the
|
||||
equivalent of combining \keyword{except} blocks and a
|
||||
|
|
@ -540,10 +540,10 @@ Traceback (most recent call last):
|
|||
StopIteration
|
||||
\end{verbatim}
|
||||
|
||||
Because \keyword{yield} will often be returning \constant{None}, you
|
||||
\keyword{yield} will usually return \constant{None}, so you
|
||||
should always check for this case. Don't just use its value in
|
||||
expressions unless you're sure that the \method{send()} method
|
||||
will be the only method used resume your generator function.
|
||||
will be the only method used to resume your generator function.
|
||||
|
||||
In addition to \method{send()}, there are two other new methods on
|
||||
generators:
|
||||
|
|
@ -683,22 +683,22 @@ with lock:
|
|||
The lock is acquired before the block is executed and always released once
|
||||
the block is complete.
|
||||
|
||||
The \module{decimal} module's contexts, which encapsulate the desired
|
||||
precision and rounding characteristics for computations, provide a
|
||||
\method{context_manager()} method for getting a context manager:
|
||||
The new \function{localcontext()} function in the \module{decimal} module
|
||||
makes it easy to save and restore the current decimal context, which
|
||||
encapsulates the desired precision and rounding characteristics for
|
||||
computations:
|
||||
|
||||
\begin{verbatim}
|
||||
import decimal
|
||||
from decimal import Decimal, Context, localcontext
|
||||
|
||||
# Displays with default precision of 28 digits
|
||||
v1 = decimal.Decimal('578')
|
||||
print v1.sqrt()
|
||||
v = Decimal('578')
|
||||
print v.sqrt()
|
||||
|
||||
ctx = decimal.Context(prec=16)
|
||||
with ctx.context_manager():
|
||||
with localcontext(Context(prec=16)):
|
||||
# All code in this block uses a precision of 16 digits.
|
||||
# The original context is restored on exiting the block.
|
||||
print v1.sqrt()
|
||||
print v.sqrt()
|
||||
\end{verbatim}
|
||||
|
||||
\subsection{Writing Context Managers\label{context-managers}}
|
||||
|
|
@ -1115,12 +1115,14 @@ Some examples:
|
|||
\begin{verbatim}
|
||||
>>> ('http://www.python.org').partition('://')
|
||||
('http', '://', 'www.python.org')
|
||||
>>> (u'Subject: a quick question').partition(':')
|
||||
(u'Subject', u':', u' a quick question')
|
||||
>>> ('file:/usr/share/doc/index.html').partition('://')
|
||||
('file:/usr/share/doc/index.html', '', '')
|
||||
>>> (u'Subject: a quick question').partition(':')
|
||||
(u'Subject', u':', u' a quick question')
|
||||
>>> 'www.python.org'.rpartition('.')
|
||||
('www.python', '.', 'org')
|
||||
>>> 'www.python.org'.rpartition(':')
|
||||
('', '', 'www.python.org')
|
||||
\end{verbatim}
|
||||
|
||||
(Implemented by Fredrik Lundh following a suggestion by Raymond Hettinger.)
|
||||
|
|
@ -2114,14 +2116,16 @@ The pysqlite module (\url{http://www.pysqlite.org}), a wrapper for the
|
|||
SQLite embedded database, has been added to the standard library under
|
||||
the package name \module{sqlite3}.
|
||||
|
||||
SQLite is a C library that provides a SQL-language database that
|
||||
stores data in disk files without requiring a separate server process.
|
||||
SQLite is a C library that provides a lightweight disk-based database
|
||||
that doesn't require a separate server process and allows accessing
|
||||
the database using a nonstandard variant of the SQL query language.
|
||||
Some applications can use SQLite for internal data storage. It's also
|
||||
possible to prototype an application using SQLite and then port the
|
||||
code to a larger database such as PostgreSQL or Oracle.
|
||||
|
||||
pysqlite was written by Gerhard H\"aring and provides a SQL interface
|
||||
compliant with the DB-API 2.0 specification described by
|
||||
\pep{249}. This means that it should be possible to write the first
|
||||
version of your applications using SQLite for data storage. If
|
||||
switching to a larger database such as PostgreSQL or Oracle is
|
||||
later necessary, the switch should be relatively easy.
|
||||
\pep{249}.
|
||||
|
||||
If you're compiling the Python source yourself, note that the source
|
||||
tree doesn't include the SQLite code, only the wrapper module.
|
||||
|
|
@ -2148,8 +2152,8 @@ c = conn.cursor()
|
|||
|
||||
# Create table
|
||||
c.execute('''create table stocks
|
||||
(date timestamp, trans varchar, symbol varchar,
|
||||
qty decimal, price decimal)''')
|
||||
(date text, trans text, symbol text,
|
||||
qty real, price real)''')
|
||||
|
||||
# Insert a row of data
|
||||
c.execute("""insert into stocks
|
||||
|
|
|
|||
137
Doc/whatsnew/whatsnew26.tex
Normal file
137
Doc/whatsnew/whatsnew26.tex
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
\documentclass{howto}
|
||||
\usepackage{distutils}
|
||||
% $Id$
|
||||
|
||||
|
||||
\title{What's New in Python 2.6}
|
||||
\release{0.0}
|
||||
\author{A.M. Kuchling}
|
||||
\authoraddress{\email{amk@amk.ca}}
|
||||
|
||||
\begin{document}
|
||||
\maketitle
|
||||
\tableofcontents
|
||||
|
||||
This article explains the new features in Python 2.6. No release date
|
||||
for Python 2.6 has been set; it will probably be released in late 2007.
|
||||
|
||||
% Compare with previous release in 2 - 3 sentences here.
|
||||
|
||||
This article doesn't attempt to provide a complete specification of
|
||||
the new features, but instead provides a convenient overview. For
|
||||
full details, you should refer to the documentation for Python 2.6.
|
||||
% add hyperlink when the documentation becomes available online.
|
||||
If you want to understand the complete implementation and design
|
||||
rationale, refer to the PEP for a particular new feature.
|
||||
|
||||
|
||||
%======================================================================
|
||||
|
||||
% Large, PEP-level features and changes should be described here.
|
||||
|
||||
|
||||
%======================================================================
|
||||
\section{Other Language Changes}
|
||||
|
||||
Here are all of the changes that Python 2.6 makes to the core Python
|
||||
language.
|
||||
|
||||
\begin{itemize}
|
||||
\item TBD
|
||||
|
||||
\end{itemize}
|
||||
|
||||
|
||||
%======================================================================
|
||||
\subsection{Optimizations}
|
||||
|
||||
\begin{itemize}
|
||||
|
||||
\item Optimizations should be described here.
|
||||
|
||||
\end{itemize}
|
||||
|
||||
The net result of the 2.6 optimizations is that Python 2.6 runs the
|
||||
pystone benchmark around XX\% faster than Python 2.5.
|
||||
|
||||
|
||||
%======================================================================
|
||||
\section{New, Improved, and Deprecated Modules}
|
||||
|
||||
As usual, Python's standard library received a number of enhancements and
|
||||
bug fixes. Here's a partial list of the most notable changes, sorted
|
||||
alphabetically by module name. Consult the
|
||||
\file{Misc/NEWS} file in the source tree for a more
|
||||
complete list of changes, or look through the CVS logs for all the
|
||||
details.
|
||||
|
||||
\begin{itemize}
|
||||
|
||||
\item The \module{smtplib} module now supports SMTP over
|
||||
SSL thanks to the addition of the \class{SMTP_SSL} class.
|
||||
This class supports an interface identical to the existing \class{SMTP}
|
||||
class. (Contributed by Monty Taylor.)
|
||||
|
||||
\end{itemize}
|
||||
|
||||
|
||||
%======================================================================
|
||||
% whole new modules get described in \subsections here
|
||||
|
||||
|
||||
% ======================================================================
|
||||
\section{Build and C API Changes}
|
||||
|
||||
Changes to Python's build process and to the C API include:
|
||||
|
||||
\begin{itemize}
|
||||
|
||||
\item Detailed changes are listed here.
|
||||
|
||||
\end{itemize}
|
||||
|
||||
|
||||
%======================================================================
|
||||
\subsection{Port-Specific Changes}
|
||||
|
||||
Platform-specific changes go here.
|
||||
|
||||
|
||||
%======================================================================
|
||||
\section{Other Changes and Fixes \label{section-other}}
|
||||
|
||||
As usual, there were a bunch of other improvements and bugfixes
|
||||
scattered throughout the source tree. A search through the change
|
||||
logs finds there were XXX patches applied and YYY bugs fixed between
|
||||
Python 2.5 and 2.6. Both figures are likely to be underestimates.
|
||||
|
||||
Some of the more notable changes are:
|
||||
|
||||
\begin{itemize}
|
||||
|
||||
\item Details go here.
|
||||
|
||||
\end{itemize}
|
||||
|
||||
|
||||
%======================================================================
|
||||
\section{Porting to Python 2.6}
|
||||
|
||||
This section lists previously described changes that may require
|
||||
changes to your code:
|
||||
|
||||
\begin{itemize}
|
||||
|
||||
\item Everything is all in the details!
|
||||
|
||||
\end{itemize}
|
||||
|
||||
|
||||
%======================================================================
|
||||
\section{Acknowledgements \label{acks}}
|
||||
|
||||
The author would like to thank the following people for offering
|
||||
suggestions, corrections and assistance with various drafts of this
|
||||
article: .
|
||||
|
||||
\end{document}
|
||||
|
|
@ -288,9 +288,10 @@ xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx*/
|
|||
|
||||
*/
|
||||
|
||||
/* Declared elsewhere
|
||||
|
||||
PyAPI_FUNC(int) PyCallable_Check(PyObject *o);
|
||||
|
||||
/*
|
||||
Determine if the object, o, is callable. Return 1 if the
|
||||
object is callable and 0 otherwise.
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ PyAPI_FUNC(PyObject *) _Py_VaBuildValue_SizeT(const char *, va_list);
|
|||
#endif
|
||||
|
||||
PyAPI_FUNC(int) PyArg_Parse(PyObject *, const char *, ...);
|
||||
PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...);
|
||||
PyAPI_FUNC(int) PyArg_ParseTuple(PyObject *, const char *, ...) Py_FORMAT_PARSETUPLE(PyArg_ParseTuple, 2, 3);
|
||||
PyAPI_FUNC(int) PyArg_ParseTupleAndKeywords(PyObject *, PyObject *,
|
||||
const char *, char **, ...);
|
||||
PyAPI_FUNC(int) PyArg_UnpackTuple(PyObject *, const char *, Py_ssize_t, Py_ssize_t, ...);
|
||||
|
|
|
|||
|
|
@ -3,6 +3,10 @@
|
|||
|
||||
#include "pyconfig.h" /* include for defines */
|
||||
|
||||
#ifdef HAVE_STDINT_H
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
/**************************************************************************
|
||||
Symbols and macros to supply platform-independent interfaces to basic
|
||||
C language & library operations whose spellings vary across platforms.
|
||||
|
|
@ -126,7 +130,7 @@ typedef Py_intptr_t Py_ssize_t;
|
|||
* Py_ssize_t on the platform.
|
||||
*/
|
||||
#ifndef PY_FORMAT_SIZE_T
|
||||
# if SIZEOF_SIZE_T == SIZEOF_INT
|
||||
# if SIZEOF_SIZE_T == SIZEOF_INT && !defined(__APPLE__)
|
||||
# define PY_FORMAT_SIZE_T ""
|
||||
# elif SIZEOF_SIZE_T == SIZEOF_LONG
|
||||
# define PY_FORMAT_SIZE_T "l"
|
||||
|
|
@ -745,6 +749,15 @@ typedef struct fd_set {
|
|||
#define Py_GCC_ATTRIBUTE(x) __attribute__(x)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* Add PyArg_ParseTuple format where available.
|
||||
*/
|
||||
#ifdef HAVE_ATTRIBUTE_FORMAT_PARSETUPLE
|
||||
#define Py_FORMAT_PARSETUPLE(func,p1,p2) __attribute__((format(func,p1,p2)))
|
||||
#else
|
||||
#define Py_FORMAT_PARSETUPLE(func,p1,p2)
|
||||
#endif
|
||||
|
||||
/* Eliminate end-of-loop code not reached warnings from SunPro C
|
||||
* when using do{...}while(0) macros
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -199,11 +199,11 @@ class MissingSectionHeaderError(ParsingError):
|
|||
self.line = line
|
||||
|
||||
|
||||
|
||||
class RawConfigParser:
|
||||
def __init__(self, defaults=None):
|
||||
self._sections = {}
|
||||
self._defaults = {}
|
||||
def __init__(self, defaults=None, dict_type=dict):
|
||||
self._dict = dict_type
|
||||
self._sections = self._dict()
|
||||
self._defaults = self._dict()
|
||||
if defaults:
|
||||
for key, value in defaults.items():
|
||||
self._defaults[self.optionxform(key)] = value
|
||||
|
|
@ -224,7 +224,7 @@ class RawConfigParser:
|
|||
"""
|
||||
if section in self._sections:
|
||||
raise DuplicateSectionError(section)
|
||||
self._sections[section] = {}
|
||||
self._sections[section] = self._dict()
|
||||
|
||||
def has_section(self, section):
|
||||
"""Indicate whether the named section is present in the configuration.
|
||||
|
|
@ -307,7 +307,7 @@ class RawConfigParser:
|
|||
except KeyError:
|
||||
if section != DEFAULTSECT:
|
||||
raise NoSectionError(section)
|
||||
d2 = {}
|
||||
d2 = self._dict()
|
||||
d = self._defaults.copy()
|
||||
d.update(d2)
|
||||
if "__name__" in d:
|
||||
|
|
@ -453,7 +453,8 @@ class RawConfigParser:
|
|||
elif sectname == DEFAULTSECT:
|
||||
cursect = self._defaults
|
||||
else:
|
||||
cursect = {'__name__': sectname}
|
||||
cursect = self._dict()
|
||||
cursect['__name__'] = sectname
|
||||
self._sections[sectname] = cursect
|
||||
# So sections can't start with a continuation line
|
||||
optname = None
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class Queue:
|
|||
self._init(maxsize)
|
||||
# mutex must be held whenever the queue is mutating. All methods
|
||||
# that acquire mutex must release it before returning. mutex
|
||||
# is shared between the two conditions, so acquiring and
|
||||
# is shared between the three conditions, so acquiring and
|
||||
# releasing the conditions also acquires and releases mutex.
|
||||
self.mutex = threading.Lock()
|
||||
# Notify not_empty whenever an item is added to the queue; a
|
||||
|
|
|
|||
|
|
@ -264,8 +264,9 @@ class SimpleXMLRPCDispatcher:
|
|||
encoding=self.encoding)
|
||||
except:
|
||||
# report exception back to server
|
||||
exc_type, exc_value, exc_tb = sys.exc_info()
|
||||
response = xmlrpclib.dumps(
|
||||
xmlrpclib.Fault(1, "%s:%s" % sys.exc_info()[:2]),
|
||||
xmlrpclib.Fault(1, "%s:%s" % (exc_type, exc_value)),
|
||||
encoding=self.encoding, allow_none=self.allow_none,
|
||||
)
|
||||
|
||||
|
|
@ -364,9 +365,10 @@ class SimpleXMLRPCDispatcher:
|
|||
'faultString' : fault.faultString}
|
||||
)
|
||||
except:
|
||||
exc_type, exc_value, exc_tb = sys.exc_info()
|
||||
results.append(
|
||||
{'faultCode' : 1,
|
||||
'faultString' : "%s:%s" % sys.exc_info()[:2]}
|
||||
'faultString' : "%s:%s" % (exc_type, exc_value)}
|
||||
)
|
||||
return results
|
||||
|
||||
|
|
|
|||
|
|
@ -306,7 +306,7 @@ def strptime(data_string, format="%a %b %d %H:%M:%S %Y"):
|
|||
_cache_lock.release()
|
||||
found = format_regex.match(data_string)
|
||||
if not found:
|
||||
raise ValueError("time data did not match format: data=%s fmt=%s" %
|
||||
raise ValueError("time data %r does not match format %r" %
|
||||
(data_string, format))
|
||||
if len(data_string) != found.end():
|
||||
raise ValueError("unconverted data remains: %s" %
|
||||
|
|
|
|||
|
|
@ -40,8 +40,11 @@ def register(func, *targs, **kargs):
|
|||
func - function to be called at exit
|
||||
targs - optional arguments to pass to func
|
||||
kargs - optional keyword arguments to pass to func
|
||||
|
||||
func is returned to facilitate usage as a decorator.
|
||||
"""
|
||||
_exithandlers.append((func, targs, kargs))
|
||||
return func
|
||||
|
||||
if hasattr(sys, "exitfunc"):
|
||||
# Assume it's another registered exit function - append it to our list
|
||||
|
|
|
|||
|
|
@ -308,7 +308,7 @@ def decode(input, output):
|
|||
|
||||
|
||||
def encodestring(s):
|
||||
"""Encode a string."""
|
||||
"""Encode a string into multiple lines of base-64 data."""
|
||||
pieces = []
|
||||
for i in range(0, len(s), MAXBINSIZE):
|
||||
chunk = s[i : i + MAXBINSIZE]
|
||||
|
|
|
|||
|
|
@ -69,6 +69,10 @@ class dbobjTestCase(unittest.TestCase):
|
|||
self.db.close()
|
||||
self.env.close()
|
||||
|
||||
def test03_dbobj_type_before_open(self):
|
||||
# Ensure this doesn't cause a segfault.
|
||||
self.assertRaises(db.DBInvalidArgError, db.DB().type)
|
||||
|
||||
#----------------------------------------------------------------------
|
||||
|
||||
def test_suite():
|
||||
|
|
|
|||
|
|
@ -799,8 +799,10 @@ class FormContentDict(UserDict.UserDict):
|
|||
form.dict == {key: [val, val, ...], ...}
|
||||
|
||||
"""
|
||||
def __init__(self, environ=os.environ):
|
||||
self.dict = self.data = parse(environ=environ)
|
||||
def __init__(self, environ=os.environ, keep_blank_values=0, strict_parsing=0):
|
||||
self.dict = self.data = parse(environ=environ,
|
||||
keep_blank_values=keep_blank_values,
|
||||
strict_parsing=strict_parsing)
|
||||
self.query_string = environ['QUERY_STRING']
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -329,6 +329,12 @@ class StreamWriter(Codec):
|
|||
"""
|
||||
return getattr(self.stream, name)
|
||||
|
||||
def __enter__(self):
|
||||
return self
|
||||
|
||||
def __exit__(self, type, value, tb):
|
||||
self.stream.close()
|
||||
|
||||
###
|
||||
|
||||
class StreamReader(Codec):
|
||||
|
|
@ -568,6 +574,12 @@ class StreamReader(Codec):
|
|||
"""
|
||||
return getattr(self.stream, name)
|
||||
|
||||
def __enter__(self):
|
||||
return self
|
||||
|
||||
def __exit__(self, type, value, tb):
|
||||
self.stream.close()
|
||||
|
||||
###
|
||||
|
||||
class StreamReaderWriter:
|
||||
|
|
@ -641,6 +653,14 @@ class StreamReaderWriter:
|
|||
"""
|
||||
return getattr(self.stream, name)
|
||||
|
||||
# these are needed to make "with codecs.open(...)" work properly
|
||||
|
||||
def __enter__(self):
|
||||
return self
|
||||
|
||||
def __exit__(self, type, value, tb):
|
||||
self.stream.close()
|
||||
|
||||
###
|
||||
|
||||
class StreamRecoder:
|
||||
|
|
@ -751,6 +771,12 @@ class StreamRecoder:
|
|||
"""
|
||||
return getattr(self.stream, name)
|
||||
|
||||
def __enter__(self):
|
||||
return self
|
||||
|
||||
def __exit__(self, type, value, tb):
|
||||
self.stream.close()
|
||||
|
||||
### Shortcuts
|
||||
|
||||
def open(filename, mode='rb', encoding=None, errors='strict', buffering=1):
|
||||
|
|
@ -824,9 +850,10 @@ def EncodedFile(file, data_encoding, file_encoding=None, errors='strict'):
|
|||
"""
|
||||
if file_encoding is None:
|
||||
file_encoding = data_encoding
|
||||
info = lookup(data_encoding)
|
||||
sr = StreamRecoder(file, info.encode, info.decode,
|
||||
info.streamreader, info.streamwriter, errors)
|
||||
data_info = lookup(data_encoding)
|
||||
file_info = lookup(file_encoding)
|
||||
sr = StreamRecoder(file, data_info.encode, data_info.decode,
|
||||
file_info.streamreader, file_info.streamwriter, errors)
|
||||
# Add attributes to simplify introspection
|
||||
sr.data_encoding = data_encoding
|
||||
sr.file_encoding = file_encoding
|
||||
|
|
|
|||
|
|
@ -117,7 +117,8 @@ def hsv_to_rgb(h, s, v):
|
|||
p = v*(1.0 - s)
|
||||
q = v*(1.0 - s*f)
|
||||
t = v*(1.0 - s*(1.0-f))
|
||||
if i%6 == 0: return v, t, p
|
||||
i = i%6
|
||||
if i == 0: return v, t, p
|
||||
if i == 1: return q, v, p
|
||||
if i == 2: return p, v, t
|
||||
if i == 3: return p, q, v
|
||||
|
|
|
|||
|
|
@ -577,12 +577,11 @@ class CodeGenerator:
|
|||
def visitListComp(self, node):
|
||||
self.set_lineno(node)
|
||||
# setup list
|
||||
append = "$append%d" % self.__list_count
|
||||
tmpname = "$list%d" % self.__list_count
|
||||
self.__list_count = self.__list_count + 1
|
||||
self.emit('BUILD_LIST', 0)
|
||||
self.emit('DUP_TOP')
|
||||
self.emit('LOAD_ATTR', 'append')
|
||||
self._implicitNameOp('STORE', append)
|
||||
self._implicitNameOp('STORE', tmpname)
|
||||
|
||||
stack = []
|
||||
for i, for_ in zip(range(len(node.quals)), node.quals):
|
||||
|
|
@ -594,10 +593,9 @@ class CodeGenerator:
|
|||
self.visit(if_, cont)
|
||||
stack.insert(0, (start, cont, anchor))
|
||||
|
||||
self._implicitNameOp('LOAD', append)
|
||||
self._implicitNameOp('LOAD', tmpname)
|
||||
self.visit(node.expr)
|
||||
self.emit('CALL_FUNCTION', 1)
|
||||
self.emit('POP_TOP')
|
||||
self.emit('LIST_APPEND')
|
||||
|
||||
for start, cont, anchor in stack:
|
||||
if cont:
|
||||
|
|
@ -608,7 +606,7 @@ class CodeGenerator:
|
|||
self.nextBlock(skip_one)
|
||||
self.emit('JUMP_ABSOLUTE', start)
|
||||
self.startBlock(anchor)
|
||||
self._implicitNameOp('DELETE', append)
|
||||
self._implicitNameOp('DELETE', tmpname)
|
||||
|
||||
self.__list_count = self.__list_count - 1
|
||||
|
||||
|
|
|
|||
|
|
@ -427,6 +427,8 @@ if sizeof(c_uint) == sizeof(c_void_p):
|
|||
c_size_t = c_uint
|
||||
elif sizeof(c_ulong) == sizeof(c_void_p):
|
||||
c_size_t = c_ulong
|
||||
elif sizeof(c_ulonglong) == sizeof(c_void_p):
|
||||
c_size_t = c_ulonglong
|
||||
|
||||
# functions
|
||||
|
||||
|
|
|
|||
|
|
@ -37,7 +37,8 @@ def requires(resource, msg=None):
|
|||
|
||||
def find_package_modules(package, mask):
|
||||
import fnmatch
|
||||
if hasattr(package, "__loader__"):
|
||||
if (hasattr(package, "__loader__") and
|
||||
hasattr(package.__loader__, '_files')):
|
||||
path = package.__name__.replace(".", os.path.sep)
|
||||
mask = os.path.join(path, mask)
|
||||
for fnm in package.__loader__._files.iterkeys():
|
||||
|
|
|
|||
|
|
@ -215,5 +215,14 @@ class BitFieldTest(unittest.TestCase):
|
|||
("b", c_ubyte, 4)]
|
||||
self.failUnlessEqual(sizeof(X), sizeof(c_byte))
|
||||
|
||||
def test_anon_bitfields(self):
|
||||
# anonymous bit-fields gave a strange error message
|
||||
class X(Structure):
|
||||
_fields_ = [("a", c_byte, 4),
|
||||
("b", c_ubyte, 4)]
|
||||
class Y(Structure):
|
||||
_anonymous_ = ["_"]
|
||||
_fields_ = [("_", X)]
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
|
|
|||
|
|
@ -101,6 +101,19 @@ class Callbacks(unittest.TestCase):
|
|||
after = grc(o)
|
||||
self.failUnlessEqual((after, o), (before, o))
|
||||
|
||||
def test_unsupported_restype_1(self):
|
||||
# Only "fundamental" result types are supported for callback
|
||||
# functions, the type must have a non-NULL stgdict->setfunc.
|
||||
# POINTER(c_double), for example, is not supported.
|
||||
|
||||
prototype = self.functype.im_func(POINTER(c_double))
|
||||
# The type is checked when the prototype is called
|
||||
self.assertRaises(TypeError, prototype, lambda: None)
|
||||
|
||||
def test_unsupported_restype_2(self):
|
||||
prototype = self.functype.im_func(object)
|
||||
self.assertRaises(TypeError, prototype, lambda: None)
|
||||
|
||||
try:
|
||||
WINFUNCTYPE
|
||||
except NameError:
|
||||
|
|
|
|||
|
|
@ -57,5 +57,21 @@ class Test(unittest.TestCase):
|
|||
c_int()
|
||||
self.failUnlessEqual(p[:4], [1, 2, 96, 4])
|
||||
|
||||
def test_char_p(self):
|
||||
# This didn't work: bad argument to internal function
|
||||
s = c_char_p("hiho")
|
||||
self.failUnlessEqual(cast(cast(s, c_void_p), c_char_p).value,
|
||||
"hiho")
|
||||
|
||||
try:
|
||||
c_wchar_p
|
||||
except NameError:
|
||||
pass
|
||||
else:
|
||||
def test_wchar_p(self):
|
||||
s = c_wchar_p("hiho")
|
||||
self.failUnlessEqual(cast(cast(s, c_void_p), c_wchar_p).value,
|
||||
"hiho")
|
||||
|
||||
if __name__ == "__main__":
|
||||
unittest.main()
|
||||
|
|
|
|||
|
|
@ -381,5 +381,35 @@ class PointerMemberTestCase(unittest.TestCase):
|
|||
s.p = None
|
||||
self.failUnlessEqual(s.x, 12345678)
|
||||
|
||||
class TestRecursiveStructure(unittest.TestCase):
|
||||
def test_contains_itself(self):
|
||||
class Recursive(Structure):
|
||||
pass
|
||||
|
||||
try:
|
||||
Recursive._fields_ = [("next", Recursive)]
|
||||
except AttributeError, details:
|
||||
self.failUnless("Structure or union cannot contain itself" in
|
||||
str(details))
|
||||
else:
|
||||
self.fail("Structure or union cannot contain itself")
|
||||
|
||||
|
||||
def test_vice_versa(self):
|
||||
class First(Structure):
|
||||
pass
|
||||
class Second(Structure):
|
||||
pass
|
||||
|
||||
First._fields_ = [("second", Second)]
|
||||
|
||||
try:
|
||||
Second._fields_ = [("first", First)]
|
||||
except AttributeError, details:
|
||||
self.failUnless("_fields_ is final" in
|
||||
str(details))
|
||||
else:
|
||||
self.fail("AttributeError not raised")
|
||||
|
||||
if __name__ == '__main__':
|
||||
unittest.main()
|
||||
|
|
|
|||
|
|
@ -6,7 +6,8 @@ import unittest, sys
|
|||
|
||||
import _ctypes_test
|
||||
|
||||
if sys.platform == "win32":
|
||||
if sys.platform == "win32" and sizeof(c_void_p) == sizeof(c_int):
|
||||
# Only windows 32-bit has different calling conventions.
|
||||
|
||||
class WindowsTestCase(unittest.TestCase):
|
||||
def test_callconv_1(self):
|
||||
|
|
|
|||
|
|
@ -131,7 +131,7 @@ __all__ = [
|
|||
'ROUND_FLOOR', 'ROUND_UP', 'ROUND_HALF_DOWN',
|
||||
|
||||
# Functions for manipulating contexts
|
||||
'setcontext', 'getcontext'
|
||||
'setcontext', 'getcontext', 'localcontext'
|
||||
]
|
||||
|
||||
import copy as _copy
|
||||
|
|
@ -458,6 +458,49 @@ else:
|
|||
|
||||
del threading, local # Don't contaminate the namespace
|
||||
|
||||
def localcontext(ctx=None):
|
||||
"""Return a context manager for a copy of the supplied context
|
||||
|
||||
Uses a copy of the current context if no context is specified
|
||||
The returned context manager creates a local decimal context
|
||||
in a with statement:
|
||||
def sin(x):
|
||||
with localcontext() as ctx:
|
||||
ctx.prec += 2
|
||||
# Rest of sin calculation algorithm
|
||||
# uses a precision 2 greater than normal
|
||||
return +s # Convert result to normal precision
|
||||
|
||||
def sin(x):
|
||||
with localcontext(ExtendedContext):
|
||||
# Rest of sin calculation algorithm
|
||||
# uses the Extended Context from the
|
||||
# General Decimal Arithmetic Specification
|
||||
return +s # Convert result to normal context
|
||||
|
||||
"""
|
||||
# The string below can't be included in the docstring until Python 2.6
|
||||
# as the doctest module doesn't understand __future__ statements
|
||||
"""
|
||||
>>> from __future__ import with_statement
|
||||
>>> print getcontext().prec
|
||||
28
|
||||
>>> with localcontext():
|
||||
... ctx = getcontext()
|
||||
... ctx.prec() += 2
|
||||
... print ctx.prec
|
||||
...
|
||||
30
|
||||
>>> with localcontext(ExtendedContext):
|
||||
... print getcontext().prec
|
||||
...
|
||||
9
|
||||
>>> print getcontext().prec
|
||||
28
|
||||
"""
|
||||
if ctx is None: ctx = getcontext()
|
||||
return _ContextManager(ctx)
|
||||
|
||||
|
||||
##### Decimal class ###########################################
|
||||
|
||||
|
|
@ -2192,23 +2235,14 @@ for name in rounding_functions:
|
|||
|
||||
del name, val, globalname, rounding_functions
|
||||
|
||||
class ContextManager(object):
|
||||
"""Helper class to simplify Context management.
|
||||
|
||||
Sample usage:
|
||||
|
||||
with decimal.ExtendedContext:
|
||||
s = ...
|
||||
return +s # Convert result to normal precision
|
||||
|
||||
with decimal.getcontext() as ctx:
|
||||
ctx.prec += 2
|
||||
s = ...
|
||||
return +s
|
||||
class _ContextManager(object):
|
||||
"""Context manager class to support localcontext().
|
||||
|
||||
Sets a copy of the supplied context in __enter__() and restores
|
||||
the previous decimal context in __exit__()
|
||||
"""
|
||||
def __init__(self, new_context):
|
||||
self.new_context = new_context
|
||||
self.new_context = new_context.copy()
|
||||
def __enter__(self):
|
||||
self.saved_context = getcontext()
|
||||
setcontext(self.new_context)
|
||||
|
|
@ -2267,9 +2301,6 @@ class Context(object):
|
|||
s.append('traps=[' + ', '.join([t.__name__ for t, v in self.traps.items() if v]) + ']')
|
||||
return ', '.join(s) + ')'
|
||||
|
||||
def get_manager(self):
|
||||
return ContextManager(self.copy())
|
||||
|
||||
def clear_flags(self):
|
||||
"""Reset all flags to zero"""
|
||||
for flag in self.flags:
|
||||
|
|
|
|||
|
|
@ -337,37 +337,47 @@ class bdist_rpm (Command):
|
|||
if not self.keep_temp:
|
||||
rpm_cmd.append('--clean')
|
||||
rpm_cmd.append(spec_path)
|
||||
# Determine the binary rpm names that should be built out of this spec
|
||||
# file
|
||||
# Note that some of these may not be really built (if the file
|
||||
# list is empty)
|
||||
nvr_string = "%{name}-%{version}-%{release}"
|
||||
src_rpm = nvr_string + ".src.rpm"
|
||||
non_src_rpm = "%{arch}/" + nvr_string + ".%{arch}.rpm"
|
||||
q_cmd = r"rpm -q --qf '%s %s\n' --specfile '%s'" % (
|
||||
src_rpm, non_src_rpm, spec_path)
|
||||
|
||||
out = os.popen(q_cmd)
|
||||
binary_rpms = []
|
||||
source_rpm = None
|
||||
while 1:
|
||||
line = out.readline()
|
||||
if not line:
|
||||
break
|
||||
l = string.split(string.strip(line))
|
||||
assert(len(l) == 2)
|
||||
binary_rpms.append(l[1])
|
||||
# The source rpm is named after the first entry in the spec file
|
||||
if source_rpm is None:
|
||||
source_rpm = l[0]
|
||||
|
||||
status = out.close()
|
||||
if status:
|
||||
raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd))
|
||||
|
||||
self.spawn(rpm_cmd)
|
||||
|
||||
# XXX this is a nasty hack -- we really should have a proper way to
|
||||
# find out the names of the RPM files created; also, this assumes
|
||||
# that RPM creates exactly one source and one binary RPM.
|
||||
if not self.dry_run:
|
||||
if not self.binary_only:
|
||||
srpms = glob.glob(os.path.join(rpm_dir['SRPMS'], "*.rpm"))
|
||||
assert len(srpms) == 1, \
|
||||
"unexpected number of SRPM files found: %s" % srpms
|
||||
dist_file = ('bdist_rpm', 'any',
|
||||
self._dist_path(srpms[0]))
|
||||
self.distribution.dist_files.append(dist_file)
|
||||
self.move_file(srpms[0], self.dist_dir)
|
||||
srpm = os.path.join(rpm_dir['SRPMS'], source_rpm)
|
||||
assert(os.path.exists(srpm))
|
||||
self.move_file(srpm, self.dist_dir)
|
||||
|
||||
if not self.source_only:
|
||||
rpms = glob.glob(os.path.join(rpm_dir['RPMS'], "*/*.rpm"))
|
||||
debuginfo = glob.glob(os.path.join(rpm_dir['RPMS'],
|
||||
"*/*debuginfo*.rpm"))
|
||||
if debuginfo:
|
||||
rpms.remove(debuginfo[0])
|
||||
assert len(rpms) == 1, \
|
||||
"unexpected number of RPM files found: %s" % rpms
|
||||
dist_file = ('bdist_rpm', get_python_version(),
|
||||
self._dist_path(rpms[0]))
|
||||
self.distribution.dist_files.append(dist_file)
|
||||
self.move_file(rpms[0], self.dist_dir)
|
||||
if debuginfo:
|
||||
dist_file = ('bdist_rpm', get_python_version(),
|
||||
self._dist_path(debuginfo[0]))
|
||||
self.move_file(debuginfo[0], self.dist_dir)
|
||||
for rpm in binary_rpms:
|
||||
rpm = os.path.join(rpm_dir['RPMS'], rpm)
|
||||
if os.path.exists(rpm):
|
||||
self.move_file(rpm, self.dist_dir)
|
||||
# run()
|
||||
|
||||
def _dist_path(self, path):
|
||||
|
|
@ -381,6 +391,7 @@ class bdist_rpm (Command):
|
|||
spec_file = [
|
||||
'%define name ' + self.distribution.get_name(),
|
||||
'%define version ' + self.distribution.get_version().replace('-','_'),
|
||||
'%define unmangled_version ' + self.distribution.get_version(),
|
||||
'%define release ' + self.release.replace('-','_'),
|
||||
'',
|
||||
'Summary: ' + self.distribution.get_description(),
|
||||
|
|
@ -402,9 +413,9 @@ class bdist_rpm (Command):
|
|||
# but only after it has run: and we create the spec file before
|
||||
# running "sdist", in case of --spec-only.
|
||||
if self.use_bzip2:
|
||||
spec_file.append('Source0: %{name}-%{version}.tar.bz2')
|
||||
spec_file.append('Source0: %{name}-%{unmangled_version}.tar.bz2')
|
||||
else:
|
||||
spec_file.append('Source0: %{name}-%{version}.tar.gz')
|
||||
spec_file.append('Source0: %{name}-%{unmangled_version}.tar.gz')
|
||||
|
||||
spec_file.extend([
|
||||
'License: ' + self.distribution.get_license(),
|
||||
|
|
@ -479,7 +490,7 @@ class bdist_rpm (Command):
|
|||
# are just text that we drop in as-is. Hmmm.
|
||||
|
||||
script_options = [
|
||||
('prep', 'prep_script', "%setup"),
|
||||
('prep', 'prep_script', "%setup -n %{name}-%{unmangled_version}"),
|
||||
('build', 'build_script', def_build),
|
||||
('install', 'install_script',
|
||||
("%s install "
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ class build_ext (Command):
|
|||
# for extensions under Cygwin and AtheOS Python's library directory must be
|
||||
# appended to library_dirs
|
||||
if sys.platform[:6] == 'cygwin' or sys.platform[:6] == 'atheos' or \
|
||||
(sys.platform.startswith('linux') and
|
||||
((sys.platform.startswith('linux') or sys.platform.startswith('gnu')) and
|
||||
sysconfig.get_config_var('Py_ENABLE_SHARED')):
|
||||
if string.find(sys.executable, sys.exec_prefix) != -1:
|
||||
# building third party extensions
|
||||
|
|
|
|||
|
|
@ -35,6 +35,9 @@ class install_egg_info(Command):
|
|||
dir_util.remove_tree(target, dry_run=self.dry_run)
|
||||
elif os.path.exists(target):
|
||||
self.execute(os.unlink,(self.target,),"Removing "+target)
|
||||
elif not os.path.isdir(self.install_dir):
|
||||
self.execute(os.makedirs, (self.install_dir,),
|
||||
"Creating "+self.install_dir)
|
||||
log.info("Writing %s", target)
|
||||
if not self.dry_run:
|
||||
f = open(target, 'w')
|
||||
|
|
|
|||
|
|
@ -256,7 +256,7 @@ Your selection [default 1]: ''',
|
|||
body = StringIO.StringIO()
|
||||
for key, value in data.items():
|
||||
# handle multiple entries for the same name
|
||||
if type(value) != type([]):
|
||||
if type(value) not in (type([]), type( () )):
|
||||
value = [value]
|
||||
for value in value:
|
||||
value = unicode(value).encode("utf-8")
|
||||
|
|
|
|||
BIN
Lib/distutils/command/wininst-8.exe
Normal file
BIN
Lib/distutils/command/wininst-8.exe
Normal file
Binary file not shown.
|
|
@ -509,7 +509,10 @@ def get_config_vars(*args):
|
|||
# are in CFLAGS or LDFLAGS and remove them if they are.
|
||||
# This is needed when building extensions on a 10.3 system
|
||||
# using a universal build of python.
|
||||
for key in ('LDFLAGS', 'BASECFLAGS'):
|
||||
for key in ('LDFLAGS', 'BASECFLAGS',
|
||||
# a number of derived variables. These need to be
|
||||
# patched up as well.
|
||||
'CFLAGS', 'PY_CFLAGS', 'BLDSHARED'):
|
||||
flags = _config_vars[key]
|
||||
flags = re.sub('-arch\s+\w+\s', ' ', flags)
|
||||
flags = re.sub('-isysroot [^ \t]*', ' ', flags)
|
||||
|
|
|
|||
|
|
@ -82,6 +82,22 @@ def _darwin_compiler_fixup(compiler_so, cc_args):
|
|||
except ValueError:
|
||||
pass
|
||||
|
||||
# Check if the SDK that is used during compilation actually exists,
|
||||
# the universal build requires the usage of a universal SDK and not all
|
||||
# users have that installed by default.
|
||||
sysroot = None
|
||||
if '-isysroot' in cc_args:
|
||||
idx = cc_args.index('-isysroot')
|
||||
sysroot = cc_args[idx+1]
|
||||
elif '-isysroot' in compiler_so:
|
||||
idx = compiler_so.index('-isysroot')
|
||||
sysroot = compiler_so[idx+1]
|
||||
|
||||
if sysroot and not os.path.isdir(sysroot):
|
||||
log.warn("Compiling with an SDK that doesn't seem to exist: %s",
|
||||
sysroot)
|
||||
log.warn("Please check your Xcode installation")
|
||||
|
||||
return compiler_so
|
||||
|
||||
class UnixCCompiler(CCompiler):
|
||||
|
|
|
|||
|
|
@ -235,10 +235,6 @@ def decode_rfc2231(s):
|
|||
parts = s.split(TICK, 2)
|
||||
if len(parts) <= 2:
|
||||
return None, None, s
|
||||
if len(parts) > 3:
|
||||
charset, language = parts[:2]
|
||||
s = TICK.join(parts[2:])
|
||||
return charset, language, s
|
||||
return parts
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ Written by Marc-Andre Lemburg (mal@lemburg.com).
|
|||
|
||||
"""#"
|
||||
|
||||
import codecs, types
|
||||
import codecs
|
||||
from . import aliases
|
||||
|
||||
_cache = {}
|
||||
|
|
@ -60,7 +60,7 @@ def normalize_encoding(encoding):
|
|||
"""
|
||||
# Make sure we have an 8-bit string, because .translate() works
|
||||
# differently for Unicode strings.
|
||||
if type(encoding) is types.UnicodeType:
|
||||
if isinstance(encoding, unicode):
|
||||
# Note that .encode('latin-1') does *not* use the codec
|
||||
# registry, so this call doesn't recurse. (See unicodeobject.c
|
||||
# PyUnicode_AsEncodedString() for details)
|
||||
|
|
@ -90,7 +90,7 @@ def search_function(encoding):
|
|||
else:
|
||||
modnames = [norm_encoding]
|
||||
for modname in modnames:
|
||||
if not modname:
|
||||
if not modname or '.' in modname:
|
||||
continue
|
||||
try:
|
||||
mod = __import__('encodings.' + modname,
|
||||
|
|
|
|||
|
|
@ -52,14 +52,35 @@ class Codec(codecs.Codec):
|
|||
return bz2_decode(input, errors)
|
||||
|
||||
class IncrementalEncoder(codecs.IncrementalEncoder):
|
||||
def __init__(self, errors='strict'):
|
||||
assert errors == 'strict'
|
||||
self.errors = errors
|
||||
self.compressobj = bz2.BZ2Compressor()
|
||||
|
||||
def encode(self, input, final=False):
|
||||
assert self.errors == 'strict'
|
||||
return bz2.compress(input)
|
||||
if final:
|
||||
c = self.compressobj.compress(input)
|
||||
return c + self.compressobj.flush()
|
||||
else:
|
||||
return self.compressobj.compress(input)
|
||||
|
||||
def reset(self):
|
||||
self.compressobj = bz2.BZ2Compressor()
|
||||
|
||||
class IncrementalDecoder(codecs.IncrementalDecoder):
|
||||
def __init__(self, errors='strict'):
|
||||
assert errors == 'strict'
|
||||
self.errors = errors
|
||||
self.decompressobj = bz2.BZ2Decompressor()
|
||||
|
||||
def decode(self, input, final=False):
|
||||
assert self.errors == 'strict'
|
||||
return bz2.decompress(input)
|
||||
try:
|
||||
return self.decompressobj.decompress(input)
|
||||
except EOFError:
|
||||
return ''
|
||||
|
||||
def reset(self):
|
||||
self.decompressobj = bz2.BZ2Decompressor()
|
||||
|
||||
class StreamWriter(Codec,codecs.StreamWriter):
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -16,7 +16,7 @@ def encode(input, errors='strict'):
|
|||
|
||||
def decode(input, errors='strict'):
|
||||
prefix = 0
|
||||
if input.startswith(codecs.BOM_UTF8):
|
||||
if input[:3] == codecs.BOM_UTF8:
|
||||
input = input[3:]
|
||||
prefix = 3
|
||||
(output, consumed) = codecs.utf_8_decode(input, errors, True)
|
||||
|
|
|
|||
|
|
@ -51,14 +51,36 @@ class Codec(codecs.Codec):
|
|||
return zlib_decode(input, errors)
|
||||
|
||||
class IncrementalEncoder(codecs.IncrementalEncoder):
|
||||
def __init__(self, errors='strict'):
|
||||
assert errors == 'strict'
|
||||
self.errors = errors
|
||||
self.compressobj = zlib.compressobj()
|
||||
|
||||
def encode(self, input, final=False):
|
||||
assert self.errors == 'strict'
|
||||
return zlib.compress(input)
|
||||
if final:
|
||||
c = self.compressobj.compress(input)
|
||||
return c + self.compressobj.flush()
|
||||
else:
|
||||
return self.compressobj.compress(input)
|
||||
|
||||
def reset(self):
|
||||
self.compressobj = zlib.compressobj()
|
||||
|
||||
class IncrementalDecoder(codecs.IncrementalDecoder):
|
||||
def __init__(self, errors='strict'):
|
||||
assert errors == 'strict'
|
||||
self.errors = errors
|
||||
self.decompressobj = zlib.decompressobj()
|
||||
|
||||
def decode(self, input, final=False):
|
||||
assert self.errors == 'strict'
|
||||
return zlib.decompress(input)
|
||||
if final:
|
||||
c = self.decompressobj.decompress(input)
|
||||
return c + self.decompressobj.flush()
|
||||
else:
|
||||
return self.decompressobj.decompress(input)
|
||||
|
||||
def reset(self):
|
||||
self.decompressobj = zlib.decompressobj()
|
||||
|
||||
class StreamWriter(Codec,codecs.StreamWriter):
|
||||
pass
|
||||
|
|
|
|||
|
|
@ -325,6 +325,14 @@ class FTP:
|
|||
if rest is not None:
|
||||
self.sendcmd("REST %s" % rest)
|
||||
resp = self.sendcmd(cmd)
|
||||
# Some servers apparently send a 200 reply to
|
||||
# a LIST or STOR command, before the 150 reply
|
||||
# (and way before the 226 reply). This seems to
|
||||
# be in violation of the protocol (which only allows
|
||||
# 1xx or error messages for LIST), so we just discard
|
||||
# this response.
|
||||
if resp[0] == '2':
|
||||
resp = self.getresp()
|
||||
if resp[0] != '1':
|
||||
raise error_reply, resp
|
||||
else:
|
||||
|
|
@ -332,6 +340,9 @@ class FTP:
|
|||
if rest is not None:
|
||||
self.sendcmd("REST %s" % rest)
|
||||
resp = self.sendcmd(cmd)
|
||||
# See above.
|
||||
if resp[0] == '2':
|
||||
resp = self.getresp()
|
||||
if resp[0] != '1':
|
||||
raise error_reply, resp
|
||||
conn, sockaddr = sock.accept()
|
||||
|
|
|
|||
|
|
@ -25,14 +25,14 @@ def update_wrapper(wrapper,
|
|||
assigned is a tuple naming the attributes assigned directly
|
||||
from the wrapped function to the wrapper function (defaults to
|
||||
functools.WRAPPER_ASSIGNMENTS)
|
||||
updated is a tuple naming the attributes off the wrapper that
|
||||
updated is a tuple naming the attributes of the wrapper that
|
||||
are updated with the corresponding attribute from the wrapped
|
||||
function (defaults to functools.WRAPPER_UPDATES)
|
||||
"""
|
||||
for attr in assigned:
|
||||
setattr(wrapper, attr, getattr(wrapped, attr))
|
||||
for attr in updated:
|
||||
getattr(wrapper, attr).update(getattr(wrapped, attr))
|
||||
getattr(wrapper, attr).update(getattr(wrapped, attr, {}))
|
||||
# Return the wrapper so this can be used as a decorator via partial()
|
||||
return wrapper
|
||||
|
||||
|
|
|
|||
77
Lib/genericpath.py
Normal file
77
Lib/genericpath.py
Normal file
|
|
@ -0,0 +1,77 @@
|
|||
"""
|
||||
Path operations common to more than one OS
|
||||
Do not use directly. The OS specific modules import the appropriate
|
||||
functions from this module themselves.
|
||||
"""
|
||||
import os
|
||||
import stat
|
||||
|
||||
__all__ = ['commonprefix', 'exists', 'getatime', 'getctime', 'getmtime',
|
||||
'getsize', 'isdir', 'isfile']
|
||||
|
||||
|
||||
# Does a path exist?
|
||||
# This is false for dangling symbolic links on systems that support them.
|
||||
def exists(path):
|
||||
"""Test whether a path exists. Returns False for broken symbolic links"""
|
||||
try:
|
||||
st = os.stat(path)
|
||||
except os.error:
|
||||
return False
|
||||
return True
|
||||
|
||||
|
||||
# This follows symbolic links, so both islink() and isdir() can be true
|
||||
# for the same path ono systems that support symlinks
|
||||
def isfile(path):
|
||||
"""Test whether a path is a regular file"""
|
||||
try:
|
||||
st = os.stat(path)
|
||||
except os.error:
|
||||
return False
|
||||
return stat.S_ISREG(st.st_mode)
|
||||
|
||||
|
||||
# Is a path a directory?
|
||||
# This follows symbolic links, so both islink() and isdir()
|
||||
# can be true for the same path on systems that support symlinks
|
||||
def isdir(s):
|
||||
"""Return true if the pathname refers to an existing directory."""
|
||||
try:
|
||||
st = os.stat(s)
|
||||
except os.error:
|
||||
return False
|
||||
return stat.S_ISDIR(st.st_mode)
|
||||
|
||||
|
||||
def getsize(filename):
|
||||
"""Return the size of a file, reported by os.stat()."""
|
||||
return os.stat(filename).st_size
|
||||
|
||||
|
||||
def getmtime(filename):
|
||||
"""Return the last modification time of a file, reported by os.stat()."""
|
||||
return os.stat(filename).st_mtime
|
||||
|
||||
|
||||
def getatime(filename):
|
||||
"""Return the last access time of a file, reported by os.stat()."""
|
||||
return os.stat(filename).st_atime
|
||||
|
||||
|
||||
def getctime(filename):
|
||||
"""Return the metadata change time of a file, reported by os.stat()."""
|
||||
return os.stat(filename).st_ctime
|
||||
|
||||
|
||||
# Return the longest prefix of all list elements.
|
||||
def commonprefix(m):
|
||||
"Given a list of pathnames, returns the longest common leading component"
|
||||
if not m: return ''
|
||||
s1 = min(m)
|
||||
s2 = max(m)
|
||||
n = min(len(s1), len(s2))
|
||||
for i in xrange(n):
|
||||
if s1[i] != s2[i]:
|
||||
return s1[:i]
|
||||
return s1[:n]
|
||||
|
|
@ -371,7 +371,12 @@ class GzipFile:
|
|||
self.extrasize = 0
|
||||
self.offset = 0
|
||||
|
||||
def seek(self, offset):
|
||||
def seek(self, offset, whence=0):
|
||||
if whence:
|
||||
if whence == 1:
|
||||
offset = self.offset + offset
|
||||
else:
|
||||
raise ValueError('Seek from end not supported')
|
||||
if self.mode == WRITE:
|
||||
if offset < self.offset:
|
||||
raise IOError('Negative seek in write mode')
|
||||
|
|
|
|||
|
|
@ -18,8 +18,37 @@ md5(), sha1(), sha224(), sha256(), sha384(), and sha512()
|
|||
More algorithms may be available on your platform but the above are
|
||||
guaranteed to exist.
|
||||
|
||||
Choose your hash function wisely. Some have known weaknesses.
|
||||
Choose your hash function wisely. Some have known collision weaknesses.
|
||||
sha384 and sha512 will be slow on 32 bit platforms.
|
||||
|
||||
Hash objects have these methods:
|
||||
- update(arg): Update the hash object with the string arg. Repeated calls
|
||||
are equivalent to a single call with the concatenation of all
|
||||
the arguments.
|
||||
- digest(): Return the digest of the strings passed to the update() method
|
||||
so far. This may contain non-ASCII characters, including
|
||||
NUL bytes.
|
||||
- hexdigest(): Like digest() except the digest is returned as a string of
|
||||
double length, containing only hexadecimal digits.
|
||||
- copy(): Return a copy (clone) of the hash object. This can be used to
|
||||
efficiently compute the digests of strings that share a common
|
||||
initial substring.
|
||||
|
||||
For example, to obtain the digest of the string 'Nobody inspects the
|
||||
spammish repetition':
|
||||
|
||||
>>> import hashlib
|
||||
>>> m = hashlib.md5()
|
||||
>>> m.update("Nobody inspects")
|
||||
>>> m.update(" the spammish repetition")
|
||||
>>> m.digest()
|
||||
'\xbbd\x9c\x83\xdd\x1e\xa5\xc9\xd9\xde\xc9\xa1\x8d\xf0\xff\xe9'
|
||||
|
||||
More condensed:
|
||||
|
||||
>>> hashlib.sha224("Nobody inspects the spammish repetition").hexdigest()
|
||||
'a4337bc45a8fc544c03f52dc550cd6e1e87021bc896588bd79e901e2'
|
||||
|
||||
"""
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -704,7 +704,15 @@ class HTTPConnection:
|
|||
if self.debuglevel > 0:
|
||||
print "send:", repr(str)
|
||||
try:
|
||||
self.sock.sendall(str)
|
||||
blocksize=8192
|
||||
if hasattr(str,'read') :
|
||||
if self.debuglevel > 0: print "sendIng a read()able"
|
||||
data=str.read(blocksize)
|
||||
while data:
|
||||
self.sock.sendall(data)
|
||||
data=str.read(blocksize)
|
||||
else:
|
||||
self.sock.sendall(str)
|
||||
except socket.error, v:
|
||||
if v[0] == 32: # Broken pipe
|
||||
self.close()
|
||||
|
|
@ -879,7 +887,21 @@ class HTTPConnection:
|
|||
self.putrequest(method, url, **skips)
|
||||
|
||||
if body and ('content-length' not in header_names):
|
||||
self.putheader('Content-Length', str(len(body)))
|
||||
thelen=None
|
||||
try:
|
||||
thelen=str(len(body))
|
||||
except TypeError, te:
|
||||
# If this is a file-like object, try to
|
||||
# fstat its file descriptor
|
||||
import os
|
||||
try:
|
||||
thelen = str(os.fstat(body.fileno()).st_size)
|
||||
except (AttributeError, OSError):
|
||||
# Don't send a length if this failed
|
||||
if self.debuglevel > 0: print "Cannot stat!!"
|
||||
|
||||
if thelen is not None:
|
||||
self.putheader('Content-Length',thelen)
|
||||
for hdr, value in headers.iteritems():
|
||||
self.putheader(hdr, value)
|
||||
self.endheaders()
|
||||
|
|
|
|||
|
|
@ -54,25 +54,68 @@ class CodeContext:
|
|||
|
||||
def toggle_code_context_event(self, event=None):
|
||||
if not self.label:
|
||||
self.pad_frame = Tkinter.Frame(self.editwin.top,
|
||||
bg=self.bgcolor, border=2,
|
||||
relief="sunken")
|
||||
self.label = Tkinter.Label(self.pad_frame,
|
||||
text="\n" * (self.context_depth - 1),
|
||||
anchor="w", justify="left",
|
||||
font=self.textfont,
|
||||
bg=self.bgcolor, fg=self.fgcolor,
|
||||
border=0,
|
||||
width=1, # Don't request more than we get
|
||||
)
|
||||
self.label.pack(side="top", fill="x", expand=True,
|
||||
padx=4, pady=0)
|
||||
self.pad_frame.pack(side="top", fill="x", expand=False,
|
||||
padx=0, pady=0,
|
||||
after=self.editwin.status_bar)
|
||||
# The following code attempts to figure out the required border
|
||||
# width and vertical padding required for the CodeContext widget
|
||||
# to be perfectly aligned with the text in the main Text widget.
|
||||
# This is done by retrieving the appropriate attributes from the
|
||||
# editwin.text and editwin.text_frame widgets.
|
||||
#
|
||||
# All values are passed through int(str(<value>)), since some
|
||||
# values may be pixel objects, which can't simply be added added
|
||||
# to ints.
|
||||
#
|
||||
# This code is considered somewhat unstable since it relies on
|
||||
# some of Tk's inner workings. However its effect is merely
|
||||
# cosmetic; failure will only cause the CodeContext text to be
|
||||
# somewhat misaligned with the text in the main Text widget.
|
||||
#
|
||||
# To avoid possible errors, all references to the inner workings
|
||||
# of Tk are executed inside try/except blocks.
|
||||
|
||||
widgets_for_width_calc = self.editwin.text, self.editwin.text_frame
|
||||
|
||||
# calculate the required vertical padding
|
||||
padx = 0
|
||||
for widget in widgets_for_width_calc:
|
||||
try:
|
||||
# retrieve the "padx" attribte from widget's pack info
|
||||
padx += int(str( widget.pack_info()['padx'] ))
|
||||
except:
|
||||
pass
|
||||
try:
|
||||
# retrieve the widget's "padx" attribte
|
||||
padx += int(str( widget.cget('padx') ))
|
||||
except:
|
||||
pass
|
||||
|
||||
# calculate the required border width
|
||||
border_width = 0
|
||||
for widget in widgets_for_width_calc:
|
||||
try:
|
||||
# retrieve the widget's "border" attribte
|
||||
border_width += int(str( widget.cget('border') ))
|
||||
except:
|
||||
pass
|
||||
|
||||
self.label = Tkinter.Label(self.editwin.top,
|
||||
text="\n" * (self.context_depth - 1),
|
||||
anchor="w", justify="left",
|
||||
font=self.textfont,
|
||||
bg=self.bgcolor, fg=self.fgcolor,
|
||||
width=1, #don't request more than we get
|
||||
padx=padx, #line up with text widget
|
||||
border=border_width, #match border width
|
||||
relief="sunken",
|
||||
)
|
||||
|
||||
# CodeContext's label widget is packed before and above the
|
||||
# text_frame widget, thus ensuring that it will appear directly
|
||||
# above it.
|
||||
self.label.pack(side="top", fill="x", expand=False,
|
||||
before=self.editwin.text_frame)
|
||||
|
||||
else:
|
||||
self.label.destroy()
|
||||
self.pad_frame.destroy()
|
||||
self.label = None
|
||||
idleConf.SetOption("extensions", "CodeContext", "visible",
|
||||
str(self.label is not None))
|
||||
|
|
|
|||
|
|
@ -102,8 +102,8 @@ class EditorWindow(object):
|
|||
self.top.instance_dict = {}
|
||||
self.recent_files_path = os.path.join(idleConf.GetUserCfgDir(),
|
||||
'recent-files.lst')
|
||||
self.vbar = vbar = Scrollbar(top, name='vbar')
|
||||
self.text_frame = text_frame = Frame(top)
|
||||
self.vbar = vbar = Scrollbar(text_frame, name='vbar')
|
||||
self.width = idleConf.GetOption('main','EditorWindow','width')
|
||||
self.text = text = MultiCallCreator(Text)(
|
||||
text_frame, name='text', padx=5, wrap='none',
|
||||
|
|
|
|||
|
|
@ -3,6 +3,13 @@ What's New in IDLE 2.6a1?
|
|||
|
||||
*Release date: XX-XXX-200X*
|
||||
|
||||
- Patch #1362975: Rework CodeContext indentation algorithm to
|
||||
avoid hard-coding pixel widths.
|
||||
|
||||
- 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
|
||||
|
||||
- IDLE's version number takes a big jump to match the version number of
|
||||
the Python release of which it's a part.
|
||||
|
||||
|
|
|
|||
|
|
@ -351,6 +351,8 @@ class ModifiedInterpreter(InteractiveInterpreter):
|
|||
|
||||
def build_subprocess_arglist(self):
|
||||
w = ['-W' + s for s in sys.warnoptions]
|
||||
if 1/2 > 0: # account for new division
|
||||
w.append('-Qnew')
|
||||
# Maybe IDLE is installed and is being accessed via sys.path,
|
||||
# or maybe it's not installed and the idle.py script is being
|
||||
# run from the IDLE source directory.
|
||||
|
|
@ -726,6 +728,8 @@ class ModifiedInterpreter(InteractiveInterpreter):
|
|||
raise
|
||||
except:
|
||||
if use_subprocess:
|
||||
# When run w/o subprocess, both user and IDLE errors
|
||||
# are printed here; skip message in that case.
|
||||
print >> self.tkconsole.stderr, \
|
||||
"IDLE internal error in runcode()"
|
||||
self.showtraceback()
|
||||
|
|
|
|||
|
|
@ -57,9 +57,10 @@ class ScriptBinding:
|
|||
filename = self.getfilename()
|
||||
if not filename:
|
||||
return
|
||||
if not self.checksyntax(filename):
|
||||
return
|
||||
if not self.tabnanny(filename):
|
||||
return
|
||||
self.checksyntax(filename)
|
||||
|
||||
def tabnanny(self, filename):
|
||||
f = open(filename, 'r')
|
||||
|
|
@ -76,9 +77,6 @@ class ScriptBinding:
|
|||
self.editwin.gotoline(nag.get_lineno())
|
||||
self.errorbox("Tab/space error", indent_message)
|
||||
return False
|
||||
except IndentationError:
|
||||
# From tokenize(), let compile() in checksyntax find it again.
|
||||
pass
|
||||
return True
|
||||
|
||||
def checksyntax(self, filename):
|
||||
|
|
@ -139,11 +137,11 @@ class ScriptBinding:
|
|||
filename = self.getfilename()
|
||||
if not filename:
|
||||
return
|
||||
if not self.tabnanny(filename):
|
||||
return
|
||||
code = self.checksyntax(filename)
|
||||
if not code:
|
||||
return
|
||||
if not self.tabnanny(filename):
|
||||
return
|
||||
shell = self.shell
|
||||
interp = shell.interp
|
||||
if PyShell.use_subprocess:
|
||||
|
|
|
|||
|
|
@ -403,6 +403,7 @@ def getabsfile(object, _filename=None):
|
|||
return os.path.normcase(os.path.abspath(_filename))
|
||||
|
||||
modulesbyfile = {}
|
||||
_filesbymodname = {}
|
||||
|
||||
def getmodule(object, _filename=None):
|
||||
"""Return the module an object was defined in, or None if not found."""
|
||||
|
|
@ -410,19 +411,32 @@ def getmodule(object, _filename=None):
|
|||
return object
|
||||
if hasattr(object, '__module__'):
|
||||
return sys.modules.get(object.__module__)
|
||||
# Try the filename to modulename cache
|
||||
if _filename is not None and _filename in modulesbyfile:
|
||||
return sys.modules.get(modulesbyfile[_filename])
|
||||
# Try the cache again with the absolute file name
|
||||
try:
|
||||
file = getabsfile(object, _filename)
|
||||
except TypeError:
|
||||
return None
|
||||
if file in modulesbyfile:
|
||||
return sys.modules.get(modulesbyfile[file])
|
||||
for module in sys.modules.values():
|
||||
# Update the filename to module name cache and check yet again
|
||||
# Copy sys.modules in order to cope with changes while iterating
|
||||
for modname, module in sys.modules.items():
|
||||
if ismodule(module) and hasattr(module, '__file__'):
|
||||
f = module.__file__
|
||||
if f == _filesbymodname.get(modname, None):
|
||||
# Have already mapped this module, so skip it
|
||||
continue
|
||||
_filesbymodname[modname] = f
|
||||
f = getabsfile(module)
|
||||
# Always map to the name the module knows itself by
|
||||
modulesbyfile[f] = modulesbyfile[
|
||||
os.path.realpath(f)] = module.__name__
|
||||
if file in modulesbyfile:
|
||||
return sys.modules.get(modulesbyfile[file])
|
||||
# Check the main module
|
||||
main = sys.modules['__main__']
|
||||
if not hasattr(object, '__name__'):
|
||||
return None
|
||||
|
|
@ -430,6 +444,7 @@ def getmodule(object, _filename=None):
|
|||
mainobject = getattr(main, object.__name__)
|
||||
if mainobject is object:
|
||||
return main
|
||||
# Check builtins
|
||||
builtin = sys.modules['__builtin__']
|
||||
if hasattr(builtin, object.__name__):
|
||||
builtinobject = getattr(builtin, object.__name__)
|
||||
|
|
@ -444,7 +459,7 @@ def findsource(object):
|
|||
in the file and the line number indexes a line in that list. An IOError
|
||||
is raised if the source code cannot be retrieved."""
|
||||
file = getsourcefile(object) or getfile(object)
|
||||
module = getmodule(object)
|
||||
module = getmodule(object, file)
|
||||
if module:
|
||||
lines = linecache.getlines(file, module.__dict__)
|
||||
else:
|
||||
|
|
@ -457,9 +472,24 @@ def findsource(object):
|
|||
|
||||
if isclass(object):
|
||||
name = object.__name__
|
||||
pat = re.compile(r'^\s*class\s*' + name + r'\b')
|
||||
pat = re.compile(r'^(\s*)class\s*' + name + r'\b')
|
||||
# make some effort to find the best matching class definition:
|
||||
# use the one with the least indentation, which is the one
|
||||
# that's most probably not inside a function definition.
|
||||
candidates = []
|
||||
for i in range(len(lines)):
|
||||
if pat.match(lines[i]): return lines, i
|
||||
match = pat.match(lines[i])
|
||||
if match:
|
||||
# if it's at toplevel, it's already the best one
|
||||
if lines[i][0] == 'c':
|
||||
return lines, i
|
||||
# else add whitespace to candidate list
|
||||
candidates.append((match.group(1), i))
|
||||
if candidates:
|
||||
# this will sort by whitespace, and by line number,
|
||||
# less whitespace first
|
||||
candidates.sort()
|
||||
return lines, candidates[0][1]
|
||||
else:
|
||||
raise IOError('could not find class definition')
|
||||
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show more
Loading…
Add table
Add a link
Reference in a new issue