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

svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55837 | guido.van.rossum | 2007-06-08 16:04:42 -0700 (Fri, 08 Jun 2007) | 2 lines PEP 3119 -- the abc module. ................ r55838 | guido.van.rossum | 2007-06-08 17:38:55 -0700 (Fri, 08 Jun 2007) | 2 lines Implement part of PEP 3119 -- One Trick Ponies. ................ r55847 | guido.van.rossum | 2007-06-09 08:28:06 -0700 (Sat, 09 Jun 2007) | 2 lines Different way to do one trick ponies, allowing registration (per PEP strawman). ................ r55849 | guido.van.rossum | 2007-06-09 18:06:38 -0700 (Sat, 09 Jun 2007) | 3 lines Make sure that the magic looking for __hash__ (etc.) doesn't apply to real subclasses of Hashable. ................ r55852 | guido.van.rossum | 2007-06-10 08:29:51 -0700 (Sun, 10 Jun 2007) | 2 lines Add some more examples, e.g. generators and dict views. ................ r55853 | guido.van.rossum | 2007-06-10 08:31:59 -0700 (Sun, 10 Jun 2007) | 2 lines keys() and items() *are* containers -- just values() isn't. ................ r55864 | georg.brandl | 2007-06-10 15:29:40 -0700 (Sun, 10 Jun 2007) | 2 lines PEP 3127: new octal literals, binary literals. ................ r55865 | georg.brandl | 2007-06-10 15:31:37 -0700 (Sun, 10 Jun 2007) | 2 lines Some octal literal fixes in Tools. ................ r55866 | georg.brandl | 2007-06-10 15:37:43 -0700 (Sun, 10 Jun 2007) | 2 lines Tokenizer changes for PEP 3127. ................ r55867 | georg.brandl | 2007-06-10 15:37:55 -0700 (Sun, 10 Jun 2007) | 2 lines Some docs for PEP 3127. ................ r55868 | georg.brandl | 2007-06-10 15:44:39 -0700 (Sun, 10 Jun 2007) | 2 lines Missed a place in intobject.c. Is that used anymore anyway? ................ r55871 | neal.norwitz | 2007-06-10 18:31:49 -0700 (Sun, 10 Jun 2007) | 182 lines Merged revisions 55729-55868 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55731 | neal.norwitz | 2007-06-01 00:29:12 -0700 (Fri, 01 Jun 2007) | 7 lines SF 1668596/1720897: distutils now copies data files even if package_dir is empty. This needs to be backported. I'm too tired tonight. It would be great if someone backports this if the buildbots are ok with it. Otherwise, I will try to get to it tomorrow. ........ r55732 | georg.brandl | 2007-06-01 04:33:33 -0700 (Fri, 01 Jun 2007) | 2 lines Bug #1722484: remove docstrings again when running with -OO. ........ r55735 | georg.brandl | 2007-06-01 12:20:27 -0700 (Fri, 01 Jun 2007) | 2 lines Fix wrong issue number. ........ r55739 | brett.cannon | 2007-06-01 20:02:29 -0700 (Fri, 01 Jun 2007) | 3 lines Have configure raise an error when building on AtheOS. Code specific to AtheOS will be removed in Python 2.7. ........ r55746 | neal.norwitz | 2007-06-02 11:33:53 -0700 (Sat, 02 Jun 2007) | 1 line Update expected birthday of 2.6 ........ r55751 | neal.norwitz | 2007-06-03 13:32:50 -0700 (Sun, 03 Jun 2007) | 10 lines Backout the original 'fix' to 1721309 which had no effect. Different versions of Berkeley DB handle this differently. The comments and bug report should have the details. Memory is allocated in 4.4 (and presumably earlier), but not in 4.5. Thus 4.5 has the free error, but not earlier versions. Mostly update comments, plus make the free conditional. This fix was already applied to the 2.5 branch. ........ r55752 | brett.cannon | 2007-06-03 16:13:41 -0700 (Sun, 03 Jun 2007) | 6 lines Make _strptime.TimeRE().pattern() use ``\s+`` for matching whitespace instead of ``\s*``. This prevents patterns from "stealing" bits from other patterns in order to make a match work. Closes bug #1730389. Will be backported. ........ r55766 | hyeshik.chang | 2007-06-05 11:16:52 -0700 (Tue, 05 Jun 2007) | 4 lines Fix build on FreeBSD. Bluetooth HCI API in FreeBSD is quite different from Linux's. Just fix the build for now but the code doesn't support the complete capability of HCI on FreeBSD yet. ........ r55770 | hyeshik.chang | 2007-06-05 11:58:51 -0700 (Tue, 05 Jun 2007) | 4 lines Bug #1728403: Fix a bug that CJKCodecs StreamReader hangs when it reads a file that ends with incomplete sequence and sizehint argument for .read() is specified. ........ r55775 | hyeshik.chang | 2007-06-05 12:28:15 -0700 (Tue, 05 Jun 2007) | 2 lines Fix for Windows: close a temporary file before trying to delete it. ........ r55783 | guido.van.rossum | 2007-06-05 14:24:47 -0700 (Tue, 05 Jun 2007) | 2 lines Patch by Tim Delany (missing DECREF). SF #1731330. ........ r55785 | collin.winter | 2007-06-05 17:17:35 -0700 (Tue, 05 Jun 2007) | 3 lines Patch #1731049: make threading.py use a proper "raise" when checking internal state, rather than assert statements (which get stripped out by -O). ........ r55786 | facundo.batista | 2007-06-06 08:13:37 -0700 (Wed, 06 Jun 2007) | 4 lines FTP.ntransfercmd method now uses create_connection when passive, using the timeout received in connection time. ........ r55792 | facundo.batista | 2007-06-06 10:15:23 -0700 (Wed, 06 Jun 2007) | 7 lines Added an optional timeout parameter to function urllib2.urlopen, with tests in test_urllib2net.py (must have network resource enabled to execute them). Also modified test_urllib2.py because testing mock classes must take it into acount. Docs are also updated. ........ r55793 | thomas.heller | 2007-06-06 13:19:19 -0700 (Wed, 06 Jun 2007) | 1 line Build _ctypes and _ctypes_test in the ReleaseAMD64 configuration. ........ r55802 | georg.brandl | 2007-06-07 06:23:24 -0700 (Thu, 07 Jun 2007) | 3 lines Disallow function calls like foo(None=1). Backport from py3k rev. 55708 by Guido. ........ r55804 | georg.brandl | 2007-06-07 06:30:24 -0700 (Thu, 07 Jun 2007) | 2 lines Make reindent.py executable. ........ r55805 | georg.brandl | 2007-06-07 06:34:10 -0700 (Thu, 07 Jun 2007) | 2 lines Patch #1667860: Fix UnboundLocalError in urllib2. ........ r55821 | kristjan.jonsson | 2007-06-07 16:53:49 -0700 (Thu, 07 Jun 2007) | 1 line Fixing changes to getbuildinfo.c that broke linux builds ........ r55828 | thomas.heller | 2007-06-08 09:10:27 -0700 (Fri, 08 Jun 2007) | 1 line Make this test work with older Python releases where struct has no 't' format character. ........ r55829 | martin.v.loewis | 2007-06-08 10:29:20 -0700 (Fri, 08 Jun 2007) | 3 lines Bug #1733488: Fix compilation of bufferobject.c on AIX. Will backport to 2.5. ........ r55831 | thomas.heller | 2007-06-08 11:20:09 -0700 (Fri, 08 Jun 2007) | 2 lines [ 1715718 ] x64 clean compile patch for _ctypes, by Kristj?n Valur with small modifications. ........ r55832 | thomas.heller | 2007-06-08 12:01:06 -0700 (Fri, 08 Jun 2007) | 1 line Fix gcc warnings intruduced by passing Py_ssize_t to PyErr_Format calls. ........ r55833 | thomas.heller | 2007-06-08 12:08:31 -0700 (Fri, 08 Jun 2007) | 2 lines Fix wrong documentation, and correct the punktuation. Closes [1700455]. ........ r55834 | thomas.heller | 2007-06-08 12:14:23 -0700 (Fri, 08 Jun 2007) | 1 line Fix warnings by using proper function prototype. ........ r55839 | neal.norwitz | 2007-06-08 20:36:34 -0700 (Fri, 08 Jun 2007) | 7 lines Prevent expandtabs() on string and unicode objects from causing a segfault when a large width is passed on 32-bit platforms. Found by Google. It would be good for people to review this especially carefully and verify I don't have an off by one error and there is no other way to cause overflow. ........ r55841 | neal.norwitz | 2007-06-08 21:48:22 -0700 (Fri, 08 Jun 2007) | 1 line Use macro version of GET_SIZE to avoid Coverity warning (#150) about a possible error. ........ r55842 | martin.v.loewis | 2007-06-09 00:42:52 -0700 (Sat, 09 Jun 2007) | 3 lines Patch #1733960: Allow T_LONGLONG to accept ints. Will backport to 2.5. ........ r55843 | martin.v.loewis | 2007-06-09 00:58:05 -0700 (Sat, 09 Jun 2007) | 2 lines Fix Windows build. ........ r55845 | martin.v.loewis | 2007-06-09 03:10:26 -0700 (Sat, 09 Jun 2007) | 2 lines Provide LLONG_MAX for S390. ........ r55854 | thomas.heller | 2007-06-10 08:59:17 -0700 (Sun, 10 Jun 2007) | 4 lines First version of build scripts for Windows/AMD64 (no external components are built yet, and 'kill_python' is disabled). ........ r55855 | thomas.heller | 2007-06-10 10:55:51 -0700 (Sun, 10 Jun 2007) | 3 lines For now, disable the _bsddb, _sqlite3, _ssl, _testcapi, _tkinter modules in the ReleaseAMD64 configuration because they do not compile. ........ r55856 | thomas.heller | 2007-06-10 11:27:54 -0700 (Sun, 10 Jun 2007) | 1 line Need to set the environment variables, otherwise devenv.com is not found. ........ r55860 | thomas.heller | 2007-06-10 14:01:17 -0700 (Sun, 10 Jun 2007) | 1 line Revert commit 55855. ........ ................ r55880 | neal.norwitz | 2007-06-10 22:07:36 -0700 (Sun, 10 Jun 2007) | 5 lines Fix the refleak counter on test_collections. The ABC metaclass creates a registry which must be cleared on each run. Otherwise, there *seem* to be refleaks when there really aren't any. (The class is held within the registry even though it's no longer needed.) ................ r55884 | neal.norwitz | 2007-06-10 22:46:33 -0700 (Sun, 10 Jun 2007) | 1 line These tests have been removed, so they are no longer needed here ................ r55886 | georg.brandl | 2007-06-11 00:26:37 -0700 (Mon, 11 Jun 2007) | 3 lines Optimize access to True and False in the compiler (if True) and the peepholer (LOAD_NAME True). ................ r55905 | georg.brandl | 2007-06-11 10:02:26 -0700 (Mon, 11 Jun 2007) | 5 lines Remove __oct__ and __hex__ and use __index__ for converting non-ints before formatting in a base. Add a bin() builtin. ................ r55906 | georg.brandl | 2007-06-11 10:04:44 -0700 (Mon, 11 Jun 2007) | 2 lines int(x, 0) does not "guess". ................ r55907 | georg.brandl | 2007-06-11 10:05:47 -0700 (Mon, 11 Jun 2007) | 2 lines Add a comment to explain that nb_oct and nb_hex are nonfunctional. ................ r55908 | guido.van.rossum | 2007-06-11 10:49:18 -0700 (Mon, 11 Jun 2007) | 2 lines Get rid of unused imports and comment. ................ r55910 | guido.van.rossum | 2007-06-11 13:05:17 -0700 (Mon, 11 Jun 2007) | 2 lines _Abstract.__new__ now requires either no arguments or __init__ overridden. ................ r55911 | guido.van.rossum | 2007-06-11 13:07:49 -0700 (Mon, 11 Jun 2007) | 7 lines Move the collections ABCs to a separate file, _abcoll.py, in order to avoid needing to import _collections.so during the bootstrap (this will become apparent in the next submit of os.py). Add (plain and mutable) ABCs for Set, Mapping, Sequence. ................ r55912 | guido.van.rossum | 2007-06-11 13:09:31 -0700 (Mon, 11 Jun 2007) | 2 lines Rewrite the _Environ class to use the new collections ABCs. ................ r55913 | guido.van.rossum | 2007-06-11 13:59:45 -0700 (Mon, 11 Jun 2007) | 72 lines Merged revisions 55869-55912 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55869 | neal.norwitz | 2007-06-10 17:42:11 -0700 (Sun, 10 Jun 2007) | 1 line Add Atul Varma for patch # 1667860 ........ r55870 | neal.norwitz | 2007-06-10 18:22:03 -0700 (Sun, 10 Jun 2007) | 1 line Ignore valgrind problems on Ubuntu from ld ........ r55872 | neal.norwitz | 2007-06-10 18:48:46 -0700 (Sun, 10 Jun 2007) | 2 lines Ignore config.status.lineno which seems new (new autoconf?) ........ r55873 | neal.norwitz | 2007-06-10 19:14:39 -0700 (Sun, 10 Jun 2007) | 1 line Prevent these tests from running on Win64 since they don\'t apply there either ........ r55874 | neal.norwitz | 2007-06-10 19:16:10 -0700 (Sun, 10 Jun 2007) | 5 lines Fix a bug when there was a newline in the string expandtabs was called on. This also catches another condition that can overflow. Will backport. ........ r55879 | neal.norwitz | 2007-06-10 21:52:37 -0700 (Sun, 10 Jun 2007) | 1 line Prevent hang if the port cannot be opened. ........ r55881 | neal.norwitz | 2007-06-10 22:28:45 -0700 (Sun, 10 Jun 2007) | 4 lines Add all of the distuils modules that don't seem to have explicit tests. :-( Move an import in mworkscompiler so that this module can be imported on any platform. Hopefully this works on all platforms. ........ r55882 | neal.norwitz | 2007-06-10 22:35:10 -0700 (Sun, 10 Jun 2007) | 4 lines SF #1734732, lower case the module names per PEP 8. Will backport. ........ r55885 | neal.norwitz | 2007-06-10 23:16:48 -0700 (Sun, 10 Jun 2007) | 4 lines Not sure why this only fails sometimes on Unix machines. Better to disable it and only import msvccompiler on Windows since that's the only place it can work anyways. ........ r55887 | neal.norwitz | 2007-06-11 00:29:43 -0700 (Mon, 11 Jun 2007) | 4 lines Bug #1734723: Fix repr.Repr() so it doesn't ignore the maxtuple attribute. Will backport ........ r55889 | neal.norwitz | 2007-06-11 00:36:24 -0700 (Mon, 11 Jun 2007) | 1 line Reflow long line ........ r55896 | thomas.heller | 2007-06-11 08:58:33 -0700 (Mon, 11 Jun 2007) | 3 lines Use "O&" in calls to PyArg_Parse when we need a 'void*' instead of "k" or "K" codes. ........ r55901 | facundo.batista | 2007-06-11 09:27:08 -0700 (Mon, 11 Jun 2007) | 5 lines Added versionchanged flag to all the methods which received a new optional timeout parameter, and a versionadded flag to the socket.create_connection function. ........ ................ r55914 | guido.van.rossum | 2007-06-11 14:19:50 -0700 (Mon, 11 Jun 2007) | 3 lines New super() implementation, for PEP 3135 (though the PEP is not yet updated to this design, and small tweaks may still be made later). ................ r55923 | guido.van.rossum | 2007-06-11 21:15:24 -0700 (Mon, 11 Jun 2007) | 4 lines I'm guessing this module broke when Neal ripped out the types module -- it used 'list' both as a local variable and as the built-in list type. Renamed the local variable since that was easier. ................ r55924 | guido.van.rossum | 2007-06-11 21:20:05 -0700 (Mon, 11 Jun 2007) | 5 lines Change all occurrences of super(<thisclass>, <firstarg>) to super(). Seems to have worked, all the tests still pass. Exception: test_descr and test_descrtut, which have tons of these and are there to test the various usages. ................ r55939 | collin.winter | 2007-06-12 13:57:33 -0700 (Tue, 12 Jun 2007) | 1 line Patch #1735485: remove StandardError from the exception hierarchy. ................ r55954 | neal.norwitz | 2007-06-12 21:56:32 -0700 (Tue, 12 Jun 2007) | 51 lines Merged revisions 55913-55950 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55926 | marc-andre.lemburg | 2007-06-12 02:09:58 -0700 (Tue, 12 Jun 2007) | 3 lines Apply patch #1734945 to support TurboLinux as distribution. ........ r55927 | marc-andre.lemburg | 2007-06-12 02:26:49 -0700 (Tue, 12 Jun 2007) | 3 lines Add patch #1726668: Windows Vista support. ........ r55929 | thomas.heller | 2007-06-12 08:36:22 -0700 (Tue, 12 Jun 2007) | 1 line Checkout, but do not yet try to build, exernal sources. ........ r55930 | thomas.heller | 2007-06-12 09:08:27 -0700 (Tue, 12 Jun 2007) | 6 lines Add bufferoverflowU.lib to the libraries needed by _ssl (is this the right thing to do?). Set the /XP64 /RETAIL build enviroment in the makefile when building ReleaseAMD64. ........ r55931 | thomas.heller | 2007-06-12 09:23:19 -0700 (Tue, 12 Jun 2007) | 5 lines Revert this change, since it breaks the win32 build: Add bufferoverflowU.lib to the libraries needed by _ssl (is this the right thing to do?). ........ r55934 | thomas.heller | 2007-06-12 10:28:31 -0700 (Tue, 12 Jun 2007) | 3 lines Specify the bufferoverflowU.lib to the makefile on the command line (for ReleaseAMD64 builds). ........ r55937 | thomas.heller | 2007-06-12 12:02:59 -0700 (Tue, 12 Jun 2007) | 3 lines Add bufferoverflowU.lib to PCBuild\_bsddb.vcproj. Build sqlite3.dll and bsddb. ........ r55938 | thomas.heller | 2007-06-12 12:56:12 -0700 (Tue, 12 Jun 2007) | 2 lines Don't rebuild Berkeley DB if not needed (this was committed by accident). ........ r55948 | martin.v.loewis | 2007-06-12 20:42:19 -0700 (Tue, 12 Jun 2007) | 3 lines Provide PY_LLONG_MAX on all systems having long long. Will backport to 2.5. ........ ................ r55959 | guido.van.rossum | 2007-06-13 09:22:41 -0700 (Wed, 13 Jun 2007) | 2 lines Fix a compilation warning. ................
399 lines
13 KiB
Python
399 lines
13 KiB
Python
#----------------------------------------------------------------------
|
|
# Copyright (c) 1999-2001, Digital Creations, Fredericksburg, VA, USA
|
|
# and Andrew Kuchling. All rights reserved.
|
|
#
|
|
# Redistribution and use in source and binary forms, with or without
|
|
# modification, are permitted provided that the following conditions are
|
|
# met:
|
|
#
|
|
# o Redistributions of source code must retain the above copyright
|
|
# notice, this list of conditions, and the disclaimer that follows.
|
|
#
|
|
# o Redistributions in binary form must reproduce the above copyright
|
|
# notice, this list of conditions, and the following disclaimer in
|
|
# the documentation and/or other materials provided with the
|
|
# distribution.
|
|
#
|
|
# o Neither the name of Digital Creations nor the names of its
|
|
# contributors may be used to endorse or promote products derived
|
|
# from this software without specific prior written permission.
|
|
#
|
|
# THIS SOFTWARE IS PROVIDED BY DIGITAL CREATIONS AND CONTRIBUTORS *AS
|
|
# IS* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
|
|
# TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
|
|
# PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL DIGITAL
|
|
# CREATIONS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
|
|
# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
|
|
# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
|
|
# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
|
|
# TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
|
|
# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
|
|
# DAMAGE.
|
|
#----------------------------------------------------------------------
|
|
|
|
|
|
"""Support for BerkeleyDB 3.3 through 4.4 with a simple interface.
|
|
|
|
For the full featured object oriented interface use the bsddb.db module
|
|
instead. It mirrors the Sleepycat BerkeleyDB C API.
|
|
"""
|
|
|
|
try:
|
|
if __name__ == 'bsddb3':
|
|
# import _pybsddb binary as it should be the more recent version from
|
|
# a standalone pybsddb addon package than the version included with
|
|
# python as bsddb._bsddb.
|
|
import _pybsddb
|
|
_bsddb = _pybsddb
|
|
from bsddb3.dbutils import DeadlockWrap as _DeadlockWrap
|
|
else:
|
|
import _bsddb
|
|
from bsddb.dbutils import DeadlockWrap as _DeadlockWrap
|
|
except ImportError:
|
|
# Remove ourselves from sys.modules
|
|
import sys
|
|
del sys.modules[__name__]
|
|
raise
|
|
|
|
# bsddb3 calls it db, but provide _db for backwards compatibility
|
|
db = _db = _bsddb
|
|
__version__ = db.__version__
|
|
|
|
error = db.DBError # So bsddb.error will mean something...
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
import sys, os
|
|
|
|
# for backwards compatibility with python versions older than 2.3, the
|
|
# iterator interface is dynamically defined and added using a mixin
|
|
# class. old python can't tokenize it due to the yield keyword.
|
|
if sys.version >= '2.3':
|
|
import UserDict
|
|
from weakref import ref
|
|
exec("""
|
|
class _iter_mixin(UserDict.DictMixin):
|
|
def _make_iter_cursor(self):
|
|
cur = _DeadlockWrap(self.db.cursor)
|
|
key = id(cur)
|
|
self._cursor_refs[key] = ref(cur, self._gen_cref_cleaner(key))
|
|
return cur
|
|
|
|
def _gen_cref_cleaner(self, key):
|
|
# use generate the function for the weakref callback here
|
|
# to ensure that we do not hold a strict reference to cur
|
|
# in the callback.
|
|
return lambda ref: self._cursor_refs.pop(key, None)
|
|
|
|
def __iter__(self):
|
|
try:
|
|
cur = self._make_iter_cursor()
|
|
|
|
# FIXME-20031102-greg: race condition. cursor could
|
|
# be closed by another thread before this call.
|
|
|
|
# since we're only returning keys, we call the cursor
|
|
# methods with flags=0, dlen=0, dofs=0
|
|
key = _DeadlockWrap(cur.first, 0,0,0)[0]
|
|
yield key
|
|
|
|
next = cur.next
|
|
while 1:
|
|
try:
|
|
key = _DeadlockWrap(next, 0,0,0)[0]
|
|
yield key
|
|
except _bsddb.DBCursorClosedError:
|
|
cur = self._make_iter_cursor()
|
|
# FIXME-20031101-greg: race condition. cursor could
|
|
# be closed by another thread before this call.
|
|
_DeadlockWrap(cur.set, key,0,0,0)
|
|
next = cur.next
|
|
except _bsddb.DBNotFoundError:
|
|
return
|
|
except _bsddb.DBCursorClosedError:
|
|
# the database was modified during iteration. abort.
|
|
return
|
|
|
|
def iteritems(self):
|
|
if not self.db:
|
|
return
|
|
try:
|
|
cur = self._make_iter_cursor()
|
|
|
|
# FIXME-20031102-greg: race condition. cursor could
|
|
# be closed by another thread before this call.
|
|
|
|
kv = _DeadlockWrap(cur.first)
|
|
key = kv[0]
|
|
yield kv
|
|
|
|
next = cur.next
|
|
while 1:
|
|
try:
|
|
kv = _DeadlockWrap(next)
|
|
key = kv[0]
|
|
yield kv
|
|
except _bsddb.DBCursorClosedError:
|
|
cur = self._make_iter_cursor()
|
|
# FIXME-20031101-greg: race condition. cursor could
|
|
# be closed by another thread before this call.
|
|
_DeadlockWrap(cur.set, key,0,0,0)
|
|
next = cur.next
|
|
except _bsddb.DBNotFoundError:
|
|
return
|
|
except _bsddb.DBCursorClosedError:
|
|
# the database was modified during iteration. abort.
|
|
return
|
|
""")
|
|
else:
|
|
class _iter_mixin: pass
|
|
|
|
|
|
class _DBWithCursor(_iter_mixin):
|
|
"""
|
|
A simple wrapper around DB that makes it look like the bsddbobject in
|
|
the old module. It uses a cursor as needed to provide DB traversal.
|
|
"""
|
|
def __init__(self, db):
|
|
self.db = db
|
|
self.db.set_get_returns_none(0)
|
|
|
|
# FIXME-20031101-greg: I believe there is still the potential
|
|
# for deadlocks in a multithreaded environment if someone
|
|
# attempts to use the any of the cursor interfaces in one
|
|
# thread while doing a put or delete in another thread. The
|
|
# reason is that _checkCursor and _closeCursors are not atomic
|
|
# operations. Doing our own locking around self.dbc,
|
|
# self.saved_dbc_key and self._cursor_refs could prevent this.
|
|
# TODO: A test case demonstrating the problem needs to be written.
|
|
|
|
# self.dbc is a DBCursor object used to implement the
|
|
# first/next/previous/last/set_location methods.
|
|
self.dbc = None
|
|
self.saved_dbc_key = None
|
|
|
|
# a collection of all DBCursor objects currently allocated
|
|
# by the _iter_mixin interface.
|
|
self._cursor_refs = {}
|
|
|
|
def __del__(self):
|
|
self.close()
|
|
|
|
def _checkCursor(self):
|
|
if self.dbc is None:
|
|
self.dbc = _DeadlockWrap(self.db.cursor)
|
|
if self.saved_dbc_key is not None:
|
|
_DeadlockWrap(self.dbc.set, self.saved_dbc_key)
|
|
self.saved_dbc_key = None
|
|
|
|
# This method is needed for all non-cursor DB calls to avoid
|
|
# BerkeleyDB deadlocks (due to being opened with DB_INIT_LOCK
|
|
# and DB_THREAD to be thread safe) when intermixing database
|
|
# operations that use the cursor internally with those that don't.
|
|
def _closeCursors(self, save=1):
|
|
if self.dbc:
|
|
c = self.dbc
|
|
self.dbc = None
|
|
if save:
|
|
try:
|
|
self.saved_dbc_key = _DeadlockWrap(c.current, 0,0,0)[0]
|
|
except db.DBError:
|
|
pass
|
|
_DeadlockWrap(c.close)
|
|
del c
|
|
for cref in self._cursor_refs.values():
|
|
c = cref()
|
|
if c is not None:
|
|
_DeadlockWrap(c.close)
|
|
|
|
def _checkOpen(self):
|
|
if self.db is None:
|
|
raise error, "BSDDB object has already been closed"
|
|
|
|
def isOpen(self):
|
|
return self.db is not None
|
|
|
|
def __len__(self):
|
|
self._checkOpen()
|
|
return _DeadlockWrap(lambda: len(self.db)) # len(self.db)
|
|
|
|
def __getitem__(self, key):
|
|
self._checkOpen()
|
|
return _DeadlockWrap(lambda: self.db[key]) # self.db[key]
|
|
|
|
def __setitem__(self, key, value):
|
|
self._checkOpen()
|
|
self._closeCursors()
|
|
def wrapF():
|
|
self.db[key] = value
|
|
_DeadlockWrap(wrapF) # self.db[key] = value
|
|
|
|
def __delitem__(self, key):
|
|
self._checkOpen()
|
|
self._closeCursors()
|
|
def wrapF():
|
|
del self.db[key]
|
|
_DeadlockWrap(wrapF) # del self.db[key]
|
|
|
|
def close(self):
|
|
self._closeCursors(save=0)
|
|
if self.dbc is not None:
|
|
_DeadlockWrap(self.dbc.close)
|
|
v = 0
|
|
if self.db is not None:
|
|
v = _DeadlockWrap(self.db.close)
|
|
self.dbc = None
|
|
self.db = None
|
|
return v
|
|
|
|
def keys(self):
|
|
self._checkOpen()
|
|
return _DeadlockWrap(self.db.keys)
|
|
|
|
def has_key(self, key):
|
|
self._checkOpen()
|
|
return _DeadlockWrap(self.db.has_key, key)
|
|
|
|
__contains__ = has_key
|
|
|
|
def set_location(self, key):
|
|
self._checkOpen()
|
|
self._checkCursor()
|
|
return _DeadlockWrap(self.dbc.set_range, key)
|
|
|
|
def next(self):
|
|
self._checkOpen()
|
|
self._checkCursor()
|
|
rv = _DeadlockWrap(self.dbc.next)
|
|
return rv
|
|
|
|
def previous(self):
|
|
self._checkOpen()
|
|
self._checkCursor()
|
|
rv = _DeadlockWrap(self.dbc.prev)
|
|
return rv
|
|
|
|
def first(self):
|
|
self._checkOpen()
|
|
self._checkCursor()
|
|
rv = _DeadlockWrap(self.dbc.first)
|
|
return rv
|
|
|
|
def last(self):
|
|
self._checkOpen()
|
|
self._checkCursor()
|
|
rv = _DeadlockWrap(self.dbc.last)
|
|
return rv
|
|
|
|
def sync(self):
|
|
self._checkOpen()
|
|
return _DeadlockWrap(self.db.sync)
|
|
|
|
|
|
#----------------------------------------------------------------------
|
|
# Compatibility object factory functions
|
|
|
|
def hashopen(file, flag='c', mode=0o666, pgsize=None, ffactor=None, nelem=None,
|
|
cachesize=None, lorder=None, hflags=0):
|
|
|
|
flags = _checkflag(flag, file)
|
|
e = _openDBEnv(cachesize)
|
|
d = db.DB(e)
|
|
d.set_flags(hflags)
|
|
if pgsize is not None: d.set_pagesize(pgsize)
|
|
if lorder is not None: d.set_lorder(lorder)
|
|
if ffactor is not None: d.set_h_ffactor(ffactor)
|
|
if nelem is not None: d.set_h_nelem(nelem)
|
|
d.open(file, db.DB_HASH, flags, mode)
|
|
return _DBWithCursor(d)
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
def btopen(file, flag='c', mode=0o666,
|
|
btflags=0, cachesize=None, maxkeypage=None, minkeypage=None,
|
|
pgsize=None, lorder=None):
|
|
|
|
flags = _checkflag(flag, file)
|
|
e = _openDBEnv(cachesize)
|
|
d = db.DB(e)
|
|
if pgsize is not None: d.set_pagesize(pgsize)
|
|
if lorder is not None: d.set_lorder(lorder)
|
|
d.set_flags(btflags)
|
|
if minkeypage is not None: d.set_bt_minkey(minkeypage)
|
|
if maxkeypage is not None: d.set_bt_maxkey(maxkeypage)
|
|
d.open(file, db.DB_BTREE, flags, mode)
|
|
return _DBWithCursor(d)
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
|
def rnopen(file, flag='c', mode=0o666,
|
|
rnflags=0, cachesize=None, pgsize=None, lorder=None,
|
|
rlen=None, delim=None, source=None, pad=None):
|
|
|
|
flags = _checkflag(flag, file)
|
|
e = _openDBEnv(cachesize)
|
|
d = db.DB(e)
|
|
if pgsize is not None: d.set_pagesize(pgsize)
|
|
if lorder is not None: d.set_lorder(lorder)
|
|
d.set_flags(rnflags)
|
|
if delim is not None: d.set_re_delim(delim)
|
|
if rlen is not None: d.set_re_len(rlen)
|
|
if source is not None: d.set_re_source(source)
|
|
if pad is not None: d.set_re_pad(pad)
|
|
d.open(file, db.DB_RECNO, flags, mode)
|
|
return _DBWithCursor(d)
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
def _openDBEnv(cachesize):
|
|
e = db.DBEnv()
|
|
if cachesize is not None:
|
|
if cachesize >= 20480:
|
|
e.set_cachesize(0, cachesize)
|
|
else:
|
|
raise error, "cachesize must be >= 20480"
|
|
e.set_lk_detect(db.DB_LOCK_DEFAULT)
|
|
e.open('.', db.DB_PRIVATE | db.DB_CREATE | db.DB_THREAD | db.DB_INIT_LOCK | db.DB_INIT_MPOOL)
|
|
return e
|
|
|
|
def _checkflag(flag, file):
|
|
if flag == 'r':
|
|
flags = db.DB_RDONLY
|
|
elif flag == 'rw':
|
|
flags = 0
|
|
elif flag == 'w':
|
|
flags = db.DB_CREATE
|
|
elif flag == 'c':
|
|
flags = db.DB_CREATE
|
|
elif flag == 'n':
|
|
flags = db.DB_CREATE
|
|
#flags = db.DB_CREATE | db.DB_TRUNCATE
|
|
# we used db.DB_TRUNCATE flag for this before but BerkeleyDB
|
|
# 4.2.52 changed to disallowed truncate with txn environments.
|
|
if file is not None and os.path.isfile(file):
|
|
os.unlink(file)
|
|
else:
|
|
raise error, "flags should be one of 'r', 'w', 'c' or 'n'"
|
|
return flags | db.DB_THREAD
|
|
|
|
#----------------------------------------------------------------------
|
|
|
|
|
|
# This is a silly little hack that allows apps to continue to use the
|
|
# DB_THREAD flag even on systems without threads without freaking out
|
|
# BerkeleyDB.
|
|
#
|
|
# This assumes that if Python was built with thread support then
|
|
# BerkeleyDB was too.
|
|
|
|
try:
|
|
import thread
|
|
del thread
|
|
if db.version() < (3, 3, 0):
|
|
db.DB_THREAD = 0
|
|
except ImportError:
|
|
db.DB_THREAD = 0
|
|
|
|
#----------------------------------------------------------------------
|