mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00

Merged revisions 46490-46494,46496,46498,46500,46506,46521,46538,46558,46563-46567,46570-46571,46583,46593,46595-46598,46604,46606,46609-46753 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r46610 | martin.v.loewis | 2006-06-03 09:42:26 +0200 (Sat, 03 Jun 2006) | 2 lines Updated version (win32-icons2.zip) from #1490384. ........ r46612 | andrew.kuchling | 2006-06-03 20:09:41 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1472084] Fix description of do_tag ........ r46614 | andrew.kuchling | 2006-06-03 20:33:35 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1475554] Strengthen text to say 'must' instead of 'should' ........ r46616 | andrew.kuchling | 2006-06-03 20:41:28 +0200 (Sat, 03 Jun 2006) | 1 line [Bug #1441864] Clarify description of 'data' argument ........ r46617 | andrew.kuchling | 2006-06-03 20:43:24 +0200 (Sat, 03 Jun 2006) | 1 line Minor rewording ........ r46619 | andrew.kuchling | 2006-06-03 21:02:35 +0200 (Sat, 03 Jun 2006) | 9 lines [Bug #1497414] _self is a reserved word in the WATCOM 10.6 C compiler. Fix by renaming the variable. In a different module, Neal fixed it by renaming _self to self. There's already a variable named 'self' here, so I used selfptr. (I'm committing this on a Mac without Tk, but it's a simple search-and-replace. <crosses fingers>, so I'll watch the buildbots and see what happens.) ........ r46621 | fredrik.lundh | 2006-06-03 23:56:05 +0200 (Sat, 03 Jun 2006) | 5 lines "_self" is a said to be a reserved word in Watcom C 10.6. I'm not sure that's really standard compliant behaviour, but I guess we have to fix that anyway... ........ r46622 | andrew.kuchling | 2006-06-04 00:44:42 +0200 (Sun, 04 Jun 2006) | 1 line Update readme ........ r46623 | andrew.kuchling | 2006-06-04 00:59:23 +0200 (Sun, 04 Jun 2006) | 1 line Drop 0 parameter ........ r46624 | andrew.kuchling | 2006-06-04 00:59:59 +0200 (Sun, 04 Jun 2006) | 1 line Some code tidying; use curses.wrapper ........ r46625 | andrew.kuchling | 2006-06-04 01:02:15 +0200 (Sun, 04 Jun 2006) | 1 line Use True; value returned from main is unused ........ r46626 | andrew.kuchling | 2006-06-04 01:07:21 +0200 (Sun, 04 Jun 2006) | 1 line Use true division, and the True value ........ r46627 | andrew.kuchling | 2006-06-04 01:09:58 +0200 (Sun, 04 Jun 2006) | 1 line Docstring fix; use True ........ r46628 | andrew.kuchling | 2006-06-04 01:15:56 +0200 (Sun, 04 Jun 2006) | 1 line Put code in a main() function; loosen up the spacing to match current code style ........ r46629 | andrew.kuchling | 2006-06-04 01:39:07 +0200 (Sun, 04 Jun 2006) | 1 line Use functions; modernize code ........ r46630 | andrew.kuchling | 2006-06-04 01:43:22 +0200 (Sun, 04 Jun 2006) | 1 line This demo requires Medusa (not just asyncore); remove it ........ r46631 | andrew.kuchling | 2006-06-04 01:46:36 +0200 (Sun, 04 Jun 2006) | 2 lines Remove xmlrpc demo -- it duplicates the SimpleXMLRPCServer module. ........ r46632 | andrew.kuchling | 2006-06-04 01:47:22 +0200 (Sun, 04 Jun 2006) | 1 line Remove xmlrpc/ directory ........ r46633 | andrew.kuchling | 2006-06-04 01:51:21 +0200 (Sun, 04 Jun 2006) | 1 line Remove dangling reference ........ r46634 | andrew.kuchling | 2006-06-04 01:59:36 +0200 (Sun, 04 Jun 2006) | 1 line Add more whitespace; use a better socket name ........ r46635 | tim.peters | 2006-06-04 03:22:53 +0200 (Sun, 04 Jun 2006) | 2 lines Whitespace normalization. ........ r46637 | tim.peters | 2006-06-04 05:26:02 +0200 (Sun, 04 Jun 2006) | 16 lines In a PYMALLOC_DEBUG build obmalloc adds extra debugging info to each allocated block. This was using 4 bytes for each such piece of info regardless of platform. This didn't really matter before (proof: no bug reports, and the debug-build obmalloc would have assert-failed if it was ever asked for a chunk of memory >= 2**32 bytes), since container indices were plain ints. But after the Py_ssize_t changes, it's at least theoretically possible to allocate a list or string whose guts exceed 2**32 bytes, and the PYMALLOC_DEBUG routines would fail then (having only 4 bytes to record the originally requested size). Now we use sizeof(size_t) bytes for each of a PYMALLOC_DEBUG build's extra debugging fields. This won't make any difference on 32-bit boxes, but will add 16 bytes to each allocation in a debug build on a 64-bit box. ........ r46638 | tim.peters | 2006-06-04 05:38:04 +0200 (Sun, 04 Jun 2006) | 4 lines _PyObject_DebugMalloc(): The return value should add 2*sizeof(size_t) now, not 8. This probably accounts for current disasters on the 64-bit buildbot slaves. ........ r46639 | neal.norwitz | 2006-06-04 08:19:31 +0200 (Sun, 04 Jun 2006) | 1 line SF #1499797, Fix for memory leak in WindowsError_str ........ r46640 | andrew.macintyre | 2006-06-04 14:31:09 +0200 (Sun, 04 Jun 2006) | 2 lines Patch #1454481: Make thread stack size runtime tunable. ........ r46641 | andrew.macintyre | 2006-06-04 14:59:59 +0200 (Sun, 04 Jun 2006) | 2 lines clean up function declarations to conform to PEP-7 style. ........ r46642 | martin.blais | 2006-06-04 15:49:49 +0200 (Sun, 04 Jun 2006) | 15 lines Fixes in struct and socket from merge reviews. - Following Guido's comments, renamed * pack_to -> pack_into * recv_buf -> recv_into * recvfrom_buf -> recvfrom_into - Made fixes to _struct.c according to Neal Norwitz comments on the checkins list. - Converted some ints into the appropriate -- I hope -- ssize_t and size_t. ........ r46643 | ronald.oussoren | 2006-06-04 16:05:28 +0200 (Sun, 04 Jun 2006) | 3 lines "Import" LDFLAGS in Mac/OSX/Makefile.in to ensure pythonw gets build with the right compiler flags. ........ r46644 | ronald.oussoren | 2006-06-04 16:24:59 +0200 (Sun, 04 Jun 2006) | 2 lines Drop Mac wrappers for the WASTE library. ........ r46645 | tim.peters | 2006-06-04 17:49:07 +0200 (Sun, 04 Jun 2006) | 3 lines s_methods[]: Stop compiler warnings by casting s_unpack_from to PyCFunction. ........ r46646 | george.yoshida | 2006-06-04 19:04:12 +0200 (Sun, 04 Jun 2006) | 2 lines Remove a redundant word ........ r46647 | george.yoshida | 2006-06-04 19:17:25 +0200 (Sun, 04 Jun 2006) | 2 lines Markup fix ........ r46648 | martin.v.loewis | 2006-06-04 21:36:28 +0200 (Sun, 04 Jun 2006) | 2 lines Patch #1359618: Speed-up charmap encoder. ........ r46649 | georg.brandl | 2006-06-04 23:46:16 +0200 (Sun, 04 Jun 2006) | 3 lines Repair refleaks in unicodeobject. ........ r46650 | georg.brandl | 2006-06-04 23:56:52 +0200 (Sun, 04 Jun 2006) | 4 lines Patch #1346214: correctly optimize away "if 0"-style stmts (thanks to Neal for review) ........ r46651 | georg.brandl | 2006-06-05 00:15:37 +0200 (Mon, 05 Jun 2006) | 2 lines Bug #1500293: fix memory leaks in _subprocess module. ........ r46654 | tim.peters | 2006-06-05 01:43:53 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46655 | tim.peters | 2006-06-05 01:52:47 +0200 (Mon, 05 Jun 2006) | 16 lines Revert revisions: 46640 Patch #1454481: Make thread stack size runtime tunable. 46647 Markup fix The first is causing many buildbots to fail test runs, and there are multiple causes with seemingly no immediate prospects for repairing them. See python-dev discussion. Note that a branch can (and should) be created for resolving these problems, like svn copy svn+ssh://svn.python.org/python/trunk -r46640 svn+ssh://svn.python.org/python/branches/NEW_BRANCH followed by merging rev 46647 to the new branch. ........ r46656 | andrew.kuchling | 2006-06-05 02:08:09 +0200 (Mon, 05 Jun 2006) | 1 line Mention second encoding speedup ........ r46657 | gregory.p.smith | 2006-06-05 02:31:01 +0200 (Mon, 05 Jun 2006) | 7 lines bugfix: when log_archive was called with the DB_ARCH_REMOVE flag present in BerkeleyDB >= 4.2 it tried to construct a list out of an uninitialized char **log_list. feature: export the DB_ARCH_REMOVE flag by name in the module on BerkeleyDB >= 4.2. ........ r46658 | gregory.p.smith | 2006-06-05 02:33:35 +0200 (Mon, 05 Jun 2006) | 5 lines fix a bug in the previous commit. don't leak empty list on error return and fix the additional rare (out of memory only) bug that it was supposed to fix of not freeing log_list when the python allocator failed. ........ r46660 | tim.peters | 2006-06-05 02:55:26 +0200 (Mon, 05 Jun 2006) | 9 lines "Flat is better than nested." Move the long-winded, multiply-nested -R support out of runtest() and into some module-level helper functions. This makes runtest() and the -R code easier to follow. That in turn allowed seeing some opportunities for code simplification, and made it obvious that reglog.txt never got closed. ........ r46661 | hyeshik.chang | 2006-06-05 02:59:54 +0200 (Mon, 05 Jun 2006) | 3 lines Fix a potentially invalid memory access of CJKCodecs' shift-jis decoder. (found by Neal Norwitz) ........ r46663 | gregory.p.smith | 2006-06-05 03:39:52 +0200 (Mon, 05 Jun 2006) | 3 lines * support DBEnv.log_stat() method on BerkeleyDB >= 4.0 [patch #1494885] ........ r46664 | tim.peters | 2006-06-05 03:43:03 +0200 (Mon, 05 Jun 2006) | 3 lines Remove doctest.testmod's deprecated (in 2.4) `isprivate` argument. A lot of hair went into supporting that! ........ r46665 | tim.peters | 2006-06-05 03:47:24 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46666 | tim.peters | 2006-06-05 03:48:21 +0200 (Mon, 05 Jun 2006) | 2 lines Make doctest news more accurate. ........ r46667 | gregory.p.smith | 2006-06-05 03:56:15 +0200 (Mon, 05 Jun 2006) | 3 lines * support DBEnv.lsn_reset() method on BerkeleyDB >= 4.4 [patch #1494902] ........ r46668 | gregory.p.smith | 2006-06-05 04:02:25 +0200 (Mon, 05 Jun 2006) | 3 lines mention the just committed bsddb changes ........ r46671 | gregory.p.smith | 2006-06-05 19:38:04 +0200 (Mon, 05 Jun 2006) | 3 lines * add support for DBSequence objects [patch #1466734] ........ r46672 | gregory.p.smith | 2006-06-05 20:20:07 +0200 (Mon, 05 Jun 2006) | 3 lines forgot to add this file in previous commit ........ r46673 | tim.peters | 2006-06-05 20:36:12 +0200 (Mon, 05 Jun 2006) | 2 lines Whitespace normalization. ........ r46674 | tim.peters | 2006-06-05 20:36:54 +0200 (Mon, 05 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46675 | gregory.p.smith | 2006-06-05 20:48:21 +0200 (Mon, 05 Jun 2006) | 4 lines * fix DBCursor.pget() bug with keyword argument names when no data= is supplied [SF pybsddb bug #1477863] ........ r46676 | andrew.kuchling | 2006-06-05 21:05:32 +0200 (Mon, 05 Jun 2006) | 1 line Remove use of Trove name, which isn't very helpful to users ........ r46677 | andrew.kuchling | 2006-06-05 21:08:25 +0200 (Mon, 05 Jun 2006) | 1 line [Bug #1470026] Include link to list of classifiers ........ r46679 | tim.peters | 2006-06-05 22:48:49 +0200 (Mon, 05 Jun 2006) | 10 lines Access _struct attributes directly instead of mucking with getattr. string_reverse(): Simplify. assertRaises(): Raise TestFailed on failure. test_unpack_from(), test_pack_into(), test_pack_into_fn(): never use `assert` to test for an expected result (it doesn't test anything when Python is run with -O). ........ r46680 | tim.peters | 2006-06-05 22:49:27 +0200 (Mon, 05 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46681 | gregory.p.smith | 2006-06-06 01:38:06 +0200 (Tue, 06 Jun 2006) | 3 lines add depends = ['md5.h'] to the _md5 module extension for correctness sake. ........ r46682 | brett.cannon | 2006-06-06 01:51:55 +0200 (Tue, 06 Jun 2006) | 4 lines Add 3 more bytes to a buffer to cover constants in string and null byte on top of 10 possible digits for an int. Closes bug #1501223. ........ r46684 | gregory.p.smith | 2006-06-06 01:59:37 +0200 (Tue, 06 Jun 2006) | 5 lines - bsddb: the __len__ method of a DB object has been fixed to return correct results. It could previously incorrectly return 0 in some cases. Fixes SF bug 1493322 (pybsddb bug 1184012). ........ r46686 | tim.peters | 2006-06-06 02:25:07 +0200 (Tue, 06 Jun 2006) | 7 lines _PySys_Init(): It's rarely a good idea to size a buffer to the exact maximum size someone guesses is needed. In this case, if we're really worried about extreme integers, then "cp%d" can actually need 14 bytes (2 for "cp" + 1 for \0 at the end + 11 for -(2**31-1)). So reserve 128 bytes instead -- nothing is actually saved by making a stack-local buffer tiny. ........ r46687 | neal.norwitz | 2006-06-06 09:22:08 +0200 (Tue, 06 Jun 2006) | 1 line Remove unused variable (and stop compiler warning) ........ r46688 | neal.norwitz | 2006-06-06 09:23:01 +0200 (Tue, 06 Jun 2006) | 1 line Fix a bunch of parameter strings ........ r46689 | thomas.heller | 2006-06-06 13:34:33 +0200 (Tue, 06 Jun 2006) | 6 lines Convert CFieldObject tp_members to tp_getset, since there is no structmember typecode for Py_ssize_t fields. This should fix some of the errors on the PPC64 debian machine (64-bit, big endian). Assigning to readonly fields now raises AttributeError instead of TypeError, so the testcase has to be changed as well. ........ r46690 | thomas.heller | 2006-06-06 13:54:32 +0200 (Tue, 06 Jun 2006) | 1 line Damn - the sentinel was missing. And fix another silly mistake. ........ r46691 | martin.blais | 2006-06-06 14:46:55 +0200 (Tue, 06 Jun 2006) | 13 lines Normalized a few cases of whitespace in function declarations. Found them using:: find . -name '*.py' | while read i ; do grep 'def[^(]*( ' $i /dev/null ; done find . -name '*.py' | while read i ; do grep ' ):' $i /dev/null ; done (I was doing this all over my own code anyway, because I'd been using spaces in all defs, so I thought I'd make a run on the Python code as well. If you need to do such fixes in your own code, you can use xx-rename or parenregu.el within emacs.) ........ r46693 | thomas.heller | 2006-06-06 17:34:18 +0200 (Tue, 06 Jun 2006) | 1 line Specify argtypes for all test functions. Maybe that helps on strange ;-) architectures ........ r46694 | tim.peters | 2006-06-06 17:50:17 +0200 (Tue, 06 Jun 2006) | 5 lines BSequence_set_range(): Rev 46688 ("Fix a bunch of parameter strings") changed this function's signature seemingly by mistake, which is causing buildbots to fail test_bsddb3. Restored the pre-46688 signature. ........ r46695 | tim.peters | 2006-06-06 17:52:35 +0200 (Tue, 06 Jun 2006) | 4 lines On python-dev Thomas Heller said these were committed by mistake in rev 46693, so reverting this part of rev 46693. ........ r46696 | andrew.kuchling | 2006-06-06 19:10:41 +0200 (Tue, 06 Jun 2006) | 1 line Fix comment typo ........ r46697 | brett.cannon | 2006-06-06 20:08:16 +0200 (Tue, 06 Jun 2006) | 2 lines Fix coding style guide bug. ........ r46698 | thomas.heller | 2006-06-06 20:50:46 +0200 (Tue, 06 Jun 2006) | 2 lines Add a hack so that foreign functions returning float now do work on 64-bit big endian platforms. ........ r46699 | thomas.heller | 2006-06-06 21:25:13 +0200 (Tue, 06 Jun 2006) | 3 lines Use the same big-endian hack as in _ctypes/callproc.c for callback functions. This fixes the callback function tests that return float. ........ r46700 | ronald.oussoren | 2006-06-06 21:50:24 +0200 (Tue, 06 Jun 2006) | 5 lines * Ensure that "make altinstall" works when the tree was configured with --enable-framework * Also for --enable-framework: allow users to use --prefix to specify the location of the compatibility symlinks (such as /usr/local/bin/python) ........ r46701 | ronald.oussoren | 2006-06-06 21:56:00 +0200 (Tue, 06 Jun 2006) | 3 lines A quick hack to ensure the right key-bindings for IDLE on osx: install patched configuration files during a framework install. ........ r46702 | tim.peters | 2006-06-07 03:04:59 +0200 (Wed, 07 Jun 2006) | 4 lines dash_R_cleanup(): Clear filecmp._cache. This accounts for different results across -R runs (at least on Windows) of test_filecmp. ........ r46705 | tim.peters | 2006-06-07 08:57:51 +0200 (Wed, 07 Jun 2006) | 17 lines SF patch 1501987: Remove randomness from test_exceptions, from ?iga Seilnacht (sorry about the name, but Firefox on my box can't display the first character of the name -- the SF "Unix name" is zseil). This appears to cure the oddball intermittent leaks across runs when running test_exceptions under -R. I'm not sure why, but I'm too sleepy to care ;-) The thrust of the SF patch was to remove randomness in the pickle protocol used. I changed the patch to use range(pickle.HIGHEST_PROTOCOL + 1), to try both pickle and cPickle, and randomly mucked with other test lines to put statements on their own lines. Not a bugfix candidate (this is fiddling new-in-2.5 code). ........ r46706 | andrew.kuchling | 2006-06-07 15:55:33 +0200 (Wed, 07 Jun 2006) | 1 line Add an SQLite introduction, taken from the 'What's New' text ........ r46708 | andrew.kuchling | 2006-06-07 19:02:52 +0200 (Wed, 07 Jun 2006) | 1 line Mention other placeholders ........ r46709 | andrew.kuchling | 2006-06-07 19:03:46 +0200 (Wed, 07 Jun 2006) | 1 line Add an item; also, escape % ........ r46710 | andrew.kuchling | 2006-06-07 19:04:01 +0200 (Wed, 07 Jun 2006) | 1 line Mention other placeholders ........ r46716 | ronald.oussoren | 2006-06-07 20:57:44 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/Tools one level up ........ r46717 | ronald.oussoren | 2006-06-07 20:58:01 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/PythonLauncher one level up ........ r46718 | ronald.oussoren | 2006-06-07 20:58:42 +0200 (Wed, 07 Jun 2006) | 2 lines mv Mac/OSX/BuildScript one level up ........ r46719 | ronald.oussoren | 2006-06-07 21:02:03 +0200 (Wed, 07 Jun 2006) | 2 lines Move Mac/OSX/* one level up ........ r46720 | ronald.oussoren | 2006-06-07 21:06:01 +0200 (Wed, 07 Jun 2006) | 2 lines And the last bit: move IDLE one level up and adjust makefiles ........ r46723 | ronald.oussoren | 2006-06-07 21:38:53 +0200 (Wed, 07 Jun 2006) | 4 lines - Patch the correct version of python in the Info.plists at build time, instead of relying on a maintainer to update them before releases. - Remove the now empty Mac/OSX directory ........ r46727 | ronald.oussoren | 2006-06-07 22:18:44 +0200 (Wed, 07 Jun 2006) | 7 lines * If BuildApplet.py is used as an applet it starts with a version of sys.exutable that isn't usuable on an #!-line. That results in generated applets that don't actually work. Work around this problem by resetting sys.executable. * argvemulator.py didn't work on intel macs. This patch fixes this (bug #1491468) ........ r46728 | tim.peters | 2006-06-07 22:40:06 +0200 (Wed, 07 Jun 2006) | 2 lines Whitespace normalization. ........ r46729 | tim.peters | 2006-06-07 22:40:54 +0200 (Wed, 07 Jun 2006) | 2 lines Add missing svn:eol-style property to text files. ........ r46730 | thomas.heller | 2006-06-07 22:43:06 +0200 (Wed, 07 Jun 2006) | 7 lines Fix for foreign functions returning small structures on 64-bit big endian machines. Should fix the remaininf failure in the PPC64 Debian buildbot. Thanks to Matthias Klose for providing access to a machine to debug and test this. ........ r46731 | brett.cannon | 2006-06-07 23:48:17 +0200 (Wed, 07 Jun 2006) | 2 lines Clarify documentation for bf_getcharbuffer. ........ r46735 | neal.norwitz | 2006-06-08 07:12:45 +0200 (Thu, 08 Jun 2006) | 1 line Fix a refleak in recvfrom_into ........ r46736 | gregory.p.smith | 2006-06-08 07:17:08 +0200 (Thu, 08 Jun 2006) | 9 lines - bsddb: the bsddb.dbtables Modify method now raises the proper error and aborts the db transaction safely when a modifier callback fails. Fixes SF python patch/bug #1408584. Also cleans up the bsddb.dbtables docstrings since thats the only documentation that exists for that unadvertised module. (people really should really just use sqlite3) ........ r46737 | gregory.p.smith | 2006-06-08 07:38:11 +0200 (Thu, 08 Jun 2006) | 4 lines * Turn the deadlock situation described in SF bug #775414 into a DBDeadLockError exception. * add the test case for my previous dbtables commit. ........ r46738 | gregory.p.smith | 2006-06-08 07:39:54 +0200 (Thu, 08 Jun 2006) | 2 lines pasted set_lk_detect line in wrong spot in previous commit. fixed. passes tests this time. ........ r46739 | armin.rigo | 2006-06-08 12:56:24 +0200 (Thu, 08 Jun 2006) | 6 lines (arre, arigo) SF bug #1350060 Give a consistent behavior for comparison and hashing of method objects (both user- and built-in methods). Now compares the 'self' recursively. The hash was already asking for the hash of 'self'. ........ r46740 | andrew.kuchling | 2006-06-08 13:56:44 +0200 (Thu, 08 Jun 2006) | 1 line Typo fix ........ r46741 | georg.brandl | 2006-06-08 14:45:01 +0200 (Thu, 08 Jun 2006) | 2 lines Bug #1502750: Fix getargs "i" format to use LONG_MIN and LONG_MAX for bounds checking. ........ r46743 | georg.brandl | 2006-06-08 14:54:13 +0200 (Thu, 08 Jun 2006) | 2 lines Bug #1502728: Correctly link against librt library on HP-UX. ........ r46745 | georg.brandl | 2006-06-08 14:55:47 +0200 (Thu, 08 Jun 2006) | 3 lines Add news for recent bugfix. ........ r46746 | georg.brandl | 2006-06-08 15:31:07 +0200 (Thu, 08 Jun 2006) | 4 lines Argh. "integer" is a very confusing word ;) Actually, checking for INT_MAX and INT_MIN is correct since the format code explicitly handles a C "int". ........ r46748 | nick.coghlan | 2006-06-08 15:54:49 +0200 (Thu, 08 Jun 2006) | 1 line Add functools.update_wrapper() and functools.wraps() as described in PEP 356 ........ r46751 | georg.brandl | 2006-06-08 16:50:21 +0200 (Thu, 08 Jun 2006) | 4 lines Bug #1502805: don't alias file.__exit__ to file.close since the latter can return something that's true. ........ r46752 | georg.brandl | 2006-06-08 16:50:53 +0200 (Thu, 08 Jun 2006) | 3 lines Convert test_file to unittest. ........
602 lines
23 KiB
TeX
602 lines
23 KiB
TeX
\section{\module{sqlite3} ---
|
|
DB-API 2.0 interface for SQLite databases}
|
|
|
|
\declaremodule{builtin}{sqlite3}
|
|
\modulesynopsis{A DB-API 2.0 implementation using SQLite 3.x.}
|
|
\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.
|
|
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.
|
|
|
|
To use the module, you must first create a \class{Connection} object
|
|
that represents the database. Here the data will be stored in the
|
|
\file{/tmp/example} file:
|
|
|
|
\begin{verbatim}
|
|
conn = sqlite3.connect('/tmp/example')
|
|
\end{verbatim}
|
|
|
|
You can also supply the special name \samp{:memory:} to create
|
|
a database in RAM.
|
|
|
|
Once you have a \class{Connection}, you can create a \class{Cursor}
|
|
object and call its \method{execute()} method to perform SQL commands:
|
|
|
|
\begin{verbatim}
|
|
c = conn.cursor()
|
|
|
|
# Create table
|
|
c.execute('''create table stocks
|
|
(date timestamp, trans varchar, symbol varchar,
|
|
qty decimal, price decimal)''')
|
|
|
|
# Insert a row of data
|
|
c.execute("""insert into stocks
|
|
values ('2006-01-05','BUY','RHAT',100,35.14)""")
|
|
\end{verbatim}
|
|
|
|
Usually your SQL operations will need to use values from Python
|
|
variables. You shouldn't assemble your query using Python's string
|
|
operations because doing so is insecure; it makes your program
|
|
vulnerable to an SQL injection attack.
|
|
|
|
Instead, use the DB-API's parameter substitution. Put \samp{?} as a
|
|
placeholder wherever you want to use a value, and then provide a tuple
|
|
of values as the second argument to the cursor's \method{execute()}
|
|
method. (Other database modules may use a different placeholder,
|
|
such as \samp{\%s} or \samp{:1}.) For example:
|
|
|
|
\begin{verbatim}
|
|
# Never do this -- insecure!
|
|
symbol = 'IBM'
|
|
c.execute("... where symbol = '%s'" % symbol)
|
|
|
|
# Do this instead
|
|
t = (symbol,)
|
|
c.execute('select * from stocks where symbol=?', t)
|
|
|
|
# Larger example
|
|
for t in (('2006-03-28', 'BUY', 'IBM', 1000, 45.00),
|
|
('2006-04-05', 'BUY', 'MSOFT', 1000, 72.00),
|
|
('2006-04-06', 'SELL', 'IBM', 500, 53.00),
|
|
):
|
|
c.execute('insert into stocks values (?,?,?,?,?)', t)
|
|
\end{verbatim}
|
|
|
|
To retrieve data after executing a SELECT statement, you can either
|
|
treat the cursor as an iterator, call the cursor's \method{fetchone()}
|
|
method to retrieve a single matching row,
|
|
or call \method{fetchall()} to get a list of the matching rows.
|
|
|
|
This example uses the iterator form:
|
|
|
|
\begin{verbatim}
|
|
>>> c = conn.cursor()
|
|
>>> c.execute('select * from stocks order by price')
|
|
>>> for row in c:
|
|
... print row
|
|
...
|
|
(u'2006-01-05', u'BUY', u'RHAT', 100, 35.140000000000001)
|
|
(u'2006-03-28', u'BUY', u'IBM', 1000, 45.0)
|
|
(u'2006-04-06', u'SELL', u'IBM', 500, 53.0)
|
|
(u'2006-04-05', u'BUY', u'MSOFT', 1000, 72.0)
|
|
>>>
|
|
\end{verbatim}
|
|
|
|
\begin{seealso}
|
|
|
|
\seeurl{http://www.pysqlite.org}
|
|
{The pysqlite web page.}
|
|
|
|
\seeurl{http://www.sqlite.org}
|
|
{The SQLite web page; the documentation describes the syntax and the
|
|
available data types for the supported SQL dialect.}
|
|
|
|
\seepep{249}{Database API Specification 2.0}{PEP written by
|
|
Marc-Andr\'e Lemburg.}
|
|
|
|
\end{seealso}
|
|
|
|
|
|
\subsection{Module functions and constants\label{sqlite3-Module-Contents}}
|
|
|
|
\begin{datadesc}{PARSE_DECLTYPES}
|
|
This constant is meant to be used with the \var{detect_types} parameter of the
|
|
\function{connect} function.
|
|
|
|
Setting it makes the \module{sqlite3} module parse the declared type for each column it
|
|
returns. It will parse out the first word of the declared type, i. e. for
|
|
"integer primary key", it will parse out "integer". Then for that column, it
|
|
will look into the converters dictionary and use the converter function
|
|
registered for that type there. Converter names are case-sensitive!
|
|
\end{datadesc}
|
|
|
|
|
|
\begin{datadesc}{PARSE_COLNAMES}
|
|
This constant is meant to be used with the \var{detect_types} parameter of the
|
|
\function{connect} function.
|
|
|
|
Setting this makes the SQLite interface parse the column name for each column
|
|
it returns. It will look for a string formed [mytype] in there, and then
|
|
decide that 'mytype' is the type of the column. It will try to find an entry of
|
|
'mytype' in the converters dictionary and then use the converter function found
|
|
there to return the value. The column name found in \member{cursor.description} is only
|
|
the first word of the column name, i. e. if you use something like
|
|
\code{'as "x [datetime]"'} in your SQL, then we will parse out everything until the
|
|
first blank for the column name: the column name would simply be "x".
|
|
\end{datadesc}
|
|
|
|
\begin{funcdesc}{connect}{database\optional{, timeout, isolation_level, detect_types, factory}}
|
|
Opens a connection to the SQLite database file \var{database}. You can use
|
|
\code{":memory:"} to open a database connection to a database that resides in
|
|
RAM instead of on disk.
|
|
|
|
When a database is accessed by multiple connections, and one of the processes
|
|
modifies the database, the SQLite database is locked until that transaction is
|
|
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.
|
|
|
|
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.
|
|
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.
|
|
|
|
\var{detect_types} defaults to 0 (i. e. off, no type detection), you can set it
|
|
to any combination of \constant{PARSE_DECLTYPES} and \constant{PARSE_COLNAMES} to turn type
|
|
detection on.
|
|
|
|
By default, the \module{sqlite3} module uses its \class{Connection} class for the
|
|
connect call. You can, however, subclass the \class{Connection} class and make
|
|
\function{connect} use your class instead by providing your class for the
|
|
\var{factory} parameter.
|
|
|
|
Consult the section \ref{sqlite3-Types} of this manual for details.
|
|
|
|
The \module{sqlite3} module internally uses a statement cache to avoid SQL parsing
|
|
overhead. If you want to explicitly set the number of statements that are
|
|
cached for the connection, you can set the \var{cached_statements} parameter.
|
|
The currently implemented default is to cache 100 statements.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{register_converter}{typename, callable}
|
|
Registers a callable to convert a bytestring from the database into a custom
|
|
Python type. The callable will be invoked for all database values that are of
|
|
the type \var{typename}. Confer the parameter \var{detect_types} of the
|
|
\function{connect} function for how the type detection works. Note that the case of
|
|
\var{typename} and the name of the type in your query must match!
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{register_adapter}{type, callable}
|
|
Registers a callable to convert the custom Python type \var{type} into one of
|
|
SQLite's supported types. The callable \var{callable} accepts as single
|
|
parameter the Python value, and must return a value of the following types:
|
|
int, long, float, str (UTF-8 encoded), unicode or buffer.
|
|
\end{funcdesc}
|
|
|
|
\begin{funcdesc}{complete_statement}{sql}
|
|
Returns \constant{True} if the string \var{sql} one or more complete SQL
|
|
statements terminated by semicolons. It does not verify if the SQL is
|
|
syntactically correct, only if there are no unclosed string literals and if the
|
|
statement is terminated by a semicolon.
|
|
|
|
This can be used to build a shell for SQLite, like in the following example:
|
|
|
|
\verbatiminput{sqlite3/complete_statement.py}
|
|
\end{funcdesc}
|
|
|
|
\subsection{Connection Objects \label{sqlite3-Connection-Objects}}
|
|
|
|
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.
|
|
\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}.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{execute}{sql, \optional{parameters}}
|
|
This is a nonstandard shortcut that creates an intermediate cursor object by
|
|
calling the cursor method, then calls the cursor's \method{execute} method with the
|
|
parameters given.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{executemany}{sql, \optional{parameters}}
|
|
This is a nonstandard shortcut that creates an intermediate cursor object by
|
|
calling the cursor method, then calls the cursor's \method{executemany} method with the
|
|
parameters given.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{executescript}{sql_script}
|
|
This is a nonstandard shortcut that creates an intermediate cursor object by
|
|
calling the cursor method, then calls the cursor's \method{executescript} method with the
|
|
parameters given.
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{create_function}{name, num_params, func}
|
|
|
|
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.
|
|
|
|
The function can return any of the types supported by SQLite: unicode, str,
|
|
int, long, float, buffer and None. Exceptions in the function are ignored and
|
|
they are handled as if the function returned None.
|
|
|
|
Example:
|
|
|
|
\verbatiminput{sqlite3/md5func.py}
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{create_aggregate}{name, num_params, aggregate_class}
|
|
|
|
Creates a user-defined aggregate function.
|
|
|
|
The aggregate class must implement a \code{step} method, which accepts the
|
|
number of parameters \var{num_params}, and a \code{finalize} method which
|
|
will return the final result of the aggregate.
|
|
|
|
The \code{finalize} method can return any of the types supported by SQLite:
|
|
unicode, str, int, long, float, buffer and None. Any exceptions are ignored.
|
|
|
|
Example:
|
|
|
|
\verbatiminput{sqlite3/mysumaggr.py}
|
|
\end{methoddesc}
|
|
|
|
\begin{methoddesc}{create_collation}{name, callable}
|
|
|
|
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
|
|
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.
|
|
|
|
Note that the callable will get its parameters as Python bytestrings, which
|
|
will normally be encoded in UTF-8.
|
|
|
|
The following example shows a custom collation that sorts "the wrong way":
|
|
|
|
\verbatiminput{sqlite3/collation_reverse.py}
|
|
|
|
To remove a collation, call \code{create_collation} with None as callable:
|
|
|
|
\begin{verbatim}
|
|
con.create_collation("reverse", None)
|
|
\end{verbatim}
|
|
\end{methoddesc}
|
|
|
|
|
|
\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.
|
|
|
|
Example:
|
|
|
|
\verbatiminput{sqlite3/row_factory.py}
|
|
|
|
If the standard tuple types don't suffice for you, 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
|
|
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.
|
|
\end{memberdesc}
|
|
|
|
\begin{memberdesc}{text_factory}
|
|
Using this attribute you can control what objects are returned for the
|
|
TEXT data type. By default, this attribute is set to \class{unicode} and
|
|
the \module{sqlite3} module will return Unicode objects for TEXT. If you want to return
|
|
bytestrings instead, you can set it to \class{str}.
|
|
|
|
For efficiency reasons, there's also a way to return Unicode objects only
|
|
for non-ASCII data, and bytestrings otherwise. To activate it, set this
|
|
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.
|
|
|
|
See the following example code for illustration:
|
|
|
|
\verbatiminput{sqlite3/text_factory.py}
|
|
\end{memberdesc}
|
|
|
|
\begin{memberdesc}{total_changes}
|
|
Returns the total number of database rows that have be modified, inserted,
|
|
or deleted since the database connection was opened.
|
|
\end{memberdesc}
|
|
|
|
|
|
|
|
|
|
|
|
\subsection{Cursor Objects \label{sqlite3-Cursor-Objects}}
|
|
|
|
A \class{Cursor} instance has the following attributes and methods:
|
|
|
|
\begin{methoddesc}{execute}{sql, \optional{parameters}}
|
|
|
|
Executes a SQL statement. The SQL statement may be parametrized (i. e.
|
|
placeholders instead of SQL literals). The \module{sqlite3} module supports two kinds of
|
|
placeholders: question marks (qmark style) and named placeholders (named
|
|
style).
|
|
|
|
This example shows how to use parameters with qmark style:
|
|
|
|
\verbatiminput{sqlite3/execute_1.py}
|
|
|
|
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
|
|
execute more than one statement with it, it will raise a Warning. Use
|
|
\method{executescript} if want to execute multiple SQL statements with one
|
|
call.
|
|
\end{methoddesc}
|
|
|
|
|
|
\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.
|
|
|
|
\verbatiminput{sqlite3/executemany_1.py}
|
|
|
|
Here's a shorter example using a generator:
|
|
|
|
\verbatiminput{sqlite3/executemany_2.py}
|
|
\end{methoddesc}
|
|
|
|
\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
|
|
gets as a parameter.
|
|
|
|
\var{sql_script} can be a bytestring or a Unicode string.
|
|
|
|
Example:
|
|
|
|
\verbatiminput{sqlite3/executescript.py}
|
|
\end{methoddesc}
|
|
|
|
\begin{memberdesc}{rowcount}
|
|
Although the \class{Cursor} class of the \module{sqlite3} module implements this
|
|
attribute, the database engine's own support for the determination of "rows
|
|
affected"/"rows selected" is quirky.
|
|
|
|
For \code{SELECT} statements, \member{rowcount} is always None because we cannot
|
|
determine the number of rows a query produced until all rows were fetched.
|
|
|
|
For \code{DELETE} statements, SQLite reports \member{rowcount} as 0 if you make a
|
|
\code{DELETE FROM table} without any condition.
|
|
|
|
For \method{executemany} statements, the number of modifications are summed
|
|
up into \member{rowcount}.
|
|
|
|
As required by the Python DB API Spec, the \member{rowcount} attribute "is -1
|
|
in case no executeXX() has been performed on the cursor or the rowcount
|
|
of the last operation is not determinable by the interface".
|
|
\end{memberdesc}
|
|
|
|
\subsection{SQLite and Python types\label{sqlite3-Types}}
|
|
|
|
\subsubsection{Introduction}
|
|
|
|
SQLite natively supports the following types: NULL, INTEGER, REAL, TEXT, BLOB.
|
|
|
|
The following Python types can thus be sent to SQLite without any problem:
|
|
|
|
\begin{tableii} {c|l}{code}{Python type}{SQLite type}
|
|
\lineii{None}{NULL}
|
|
\lineii{int}{INTEGER}
|
|
\lineii{long}{INTEGER}
|
|
\lineii{float}{REAL}
|
|
\lineii{str (UTF8-encoded)}{TEXT}
|
|
\lineii{unicode}{TEXT}
|
|
\lineii{buffer}{BLOB}
|
|
\end{tableii}
|
|
|
|
This is how SQLite types are converted to Python types by default:
|
|
|
|
\begin{tableii} {c|l}{code}{SQLite type}{Python type}
|
|
\lineii{NULL}{None}
|
|
\lineii{INTEGER}{int or long, depending on size}
|
|
\lineii{REAL}{float}
|
|
\lineii{TEXT}{depends on text_factory, unicode by default}
|
|
\lineii{BLOB}{buffer}
|
|
\end{tableii}
|
|
|
|
The type system of the \module{sqlite3} module is extensible in both 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
|
|
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,
|
|
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}.
|
|
|
|
There are two ways to enable the \module{sqlite3} module to adapt a custom Python type
|
|
to one of the supported ones.
|
|
|
|
\paragraph{Letting your object adapt itself}
|
|
|
|
This is a good approach if you write the class yourself. Let's suppose you have
|
|
a class like this:
|
|
|
|
\begin{verbatim}
|
|
class Point(object):
|
|
def __init__(self, x, y):
|
|
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.
|
|
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
|
|
\class{PrepareProtocol}.
|
|
|
|
\verbatiminput{sqlite3/adapter_point_1.py}
|
|
|
|
\paragraph{Registering an adapter callable}
|
|
|
|
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}
|
|
|
|
The \module{sqlite3} module has two default adapters for Python's builtin
|
|
\class{datetime.date} and \class{datetime.datetime} types. Now let's suppose we
|
|
want to store \class{datetime.datetime} objects not in ISO representation, but
|
|
as Unix timestamp.
|
|
|
|
\verbatiminput{sqlite3/adapter_datetime.py}
|
|
|
|
\subsubsection{Converting SQLite values to custom Python types}
|
|
|
|
Now that's all nice and dandy that you can send custom Python types to SQLite.
|
|
But to make it really useful we need to make the Python to SQLite to Python
|
|
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 first define a converter function that accepts the string as a parameter and constructs a Point object from it.
|
|
|
|
\begin{notice}
|
|
Converter functions \strong{always} get called with a string, no matter
|
|
under which data type you sent the value to SQLite.
|
|
\end{notice}
|
|
|
|
\begin{notice}
|
|
Converter names are looked up in a case-sensitive manner.
|
|
\end{notice}
|
|
|
|
|
|
\begin{verbatim}
|
|
def convert_point(s):
|
|
x, y = map(float, s.split(";"))
|
|
return Point(x, y)
|
|
\end{verbatim}
|
|
|
|
Now you need to make the \module{sqlite3} module know that what you select from the
|
|
database is actually a point. There are two ways of doing this:
|
|
|
|
\begin{itemize}
|
|
\item Implicitly via the declared type
|
|
\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}.
|
|
|
|
|
|
The following example illustrates both ways.
|
|
|
|
\verbatiminput{sqlite3/converter_point.py}
|
|
|
|
\subsubsection{Default adapters and converters}
|
|
|
|
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.
|
|
|
|
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
|
|
experimental SQLite date/time functions.
|
|
|
|
The following example demonstrates this.
|
|
|
|
\verbatiminput{sqlite3/pysqlite_datetime.py}
|
|
|
|
\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
|
|
SELECT/INSERT/UPDATE/DELETE/REPLACE).
|
|
|
|
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
|
|
is that pysqlite needs to keep track of the transaction state (if a transaction
|
|
is active or not).
|
|
|
|
You can control which kind of "BEGIN" statements pysqlite implicitly executes
|
|
(or none at all) via the \var{isolation_level} parameter to the
|
|
\function{connect} call, or via the \member{isolation_level} property of
|
|
connections.
|
|
|
|
If you want \strong{autocommit mode}, then set \member{isolation_level} to None.
|
|
|
|
Otherwise leave it at its default, which will result in a plain "BEGIN"
|
|
statement, or set it to one of SQLite's supported isolation levels: DEFERRED,
|
|
IMMEDIATE or EXCLUSIVE.
|
|
|
|
As the \module{sqlite3} module needs to keep track of the transaction state, you should
|
|
not use \code{OR ROLLBACK} or \code{ON CONFLICT ROLLBACK} in your SQL. Instead,
|
|
catch the \exception{IntegrityError} and call the \method{rollback} method of
|
|
the connection yourself.
|
|
|
|
\subsection{Using pysqlite efficiently}
|
|
|
|
\subsubsection{Using shortcut methods}
|
|
|
|
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}
|
|
objects are created implicitly and these shortcut methods return the cursor
|
|
objects. This way, you can for example 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
|
|
designed to be used as a row factory.
|
|
|
|
Rows wrapped with this class can be accessed both by index (like tuples) and
|
|
case-insensitively by name:
|
|
|
|
\verbatiminput{sqlite3/rowclass.py}
|
|
|
|
|