summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2008-09-08 02:49:30 (GMT)
committerBenjamin Peterson <benjamin@python.org>2008-09-08 02:49:30 (GMT)
commit9a46cab6134eb8e575a54cd52d14eb2f679df718 (patch)
tree323b0ada3a15d5f4923fe331cd99963d8dfb18c4 /Doc
parentbd18fd6710a95a4585c9ce17e6ea7040d727d3bc (diff)
downloadcpython-9a46cab6134eb8e575a54cd52d14eb2f679df718.zip
cpython-9a46cab6134eb8e575a54cd52d14eb2f679df718.tar.gz
cpython-9a46cab6134eb8e575a54cd52d14eb2f679df718.tar.bz2
remove some more bsddb references
Diffstat (limited to 'Doc')
-rw-r--r--Doc/library/collections.rst3
-rw-r--r--Doc/library/dbm.rst6
-rw-r--r--Doc/library/shelve.rst16
-rw-r--r--Doc/reference/datamodel.rst5
4 files changed, 11 insertions, 19 deletions
diff --git a/Doc/library/collections.rst b/Doc/library/collections.rst
index d2d4f47..94b6726 100644
--- a/Doc/library/collections.rst
+++ b/Doc/library/collections.rst
@@ -23,9 +23,6 @@ be useful when inheriting directly from :class:`dict` or
The specialized containers provided in this module provide alternatives
to Python's general purpose built-in containers, :class:`dict`,
:class:`list`, :class:`set`, and :class:`tuple`.
-Besides the containers provided here, the optional :mod:`bsddb`
-module offers the ability to create in-memory or file based ordered
-dictionaries with string keys using the :meth:`bsddb.btopen` method.
In addition to containers, the collections module provides some ABCs
(abstract base classes) that can be used to test whether a class
diff --git a/Doc/library/dbm.rst b/Doc/library/dbm.rst
index 09069e8..932c2a7 100644
--- a/Doc/library/dbm.rst
+++ b/Doc/library/dbm.rst
@@ -268,9 +268,9 @@ to simplify building this module.
database modules.
The :mod:`dbm.dumb` module provides a persistent dictionary-like interface which
-is written entirely in Python. Unlike other modules such as :mod:`gdbm` and
-:mod:`bsddb`, no external library is required. As with other persistent
-mappings, the keys and values must always be strings.
+is written entirely in Python. Unlike other modules such as :mod:`gdbm` no
+external library is required. As with other persistent mappings, the keys and
+values must always be strings.
The module defines the following:
diff --git a/Doc/library/shelve.rst b/Doc/library/shelve.rst
index 2dee026..1c35f47 100644
--- a/Doc/library/shelve.rst
+++ b/Doc/library/shelve.rst
@@ -55,15 +55,14 @@ Restrictions
.. index::
module: dbm.ndbm
module: dbm.gnu
- module: bsddb
-* The choice of which database package will be used (such as :mod:`dbm.ndbm`,
- :mod:`dbm.gnu` or :mod:`bsddb`) depends on which interface is available. Therefore
- it is not safe to open the database directly using :mod:`dbm`. The database is
- also (unfortunately) subject to the limitations of :mod:`dbm`, if it is used ---
+* The choice of which database package will be used (such as :mod:`dbm.ndbm` or
+ :mod:`dbm.gnu`) depends on which interface is available. Therefore it is not
+ safe to open the database directly using :mod:`dbm`. The database is also
+ (unfortunately) subject to the limitations of :mod:`dbm`, if it is used ---
this means that (the pickled representation of) the objects stored in the
- database should be fairly small, and in rare cases key collisions may cause the
- database to refuse updates.
+ database should be fairly small, and in rare cases key collisions may cause
+ the database to refuse updates.
* Depending on the implementation, closing a persistent dictionary may or may
not be necessary to flush changes to disk. The :meth:`__del__` method of the
@@ -155,9 +154,6 @@ object)::
Module :mod:`dbm`
Generic interface to ``dbm``-style databases.
- Module :mod:`bsddb`
- BSD ``db`` database interface.
-
Module :mod:`pickle`
Object serialization used by :mod:`shelve`.
diff --git a/Doc/reference/datamodel.rst b/Doc/reference/datamodel.rst
index 00516d1..ddc605b 100644
--- a/Doc/reference/datamodel.rst
+++ b/Doc/reference/datamodel.rst
@@ -405,10 +405,9 @@ Mappings
.. index::
module: dbm.ndbm
module: dbm.gnu
- module: bsddb
- The extension modules :mod:`dbm.ndbm`, :mod:`dbm.gnu`, and :mod:`bsddb`
- provide additional examples of mapping types, as does the :mod:`collections`
+ The extension modules :mod:`dbm.ndbm` and :mod:`dbm.gnu` provide
+ additional examples of mapping types, as does the :mod:`collections`
module.
Callable types