Skip to content

Commit 8dbeee0

Browse files
author
georg.brandl
committed
#3791: remove last traces of bsddb.
git-svn-id: http://svn.python.org/projects/python/branches/py3k@73208 6015fed2-1504-0410-9fe1-9d1591cc4771
1 parent 811d957 commit 8dbeee0

18 files changed

Lines changed: 26 additions & 292 deletions

‎Doc/library/shelve.rst‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,14 @@ Restrictions
102102
.. class:: BsdDbShelf(dict[, protocol=None[, writeback=False]])
103103

104104
A subclass of :class:`Shelf` which exposes :meth:`first`, :meth:`next`,
105-
:meth:`previous`, :meth:`last` and :meth:`set_location` which are available in
106-
the :mod:`bsddb` module but not in other database modules. The *dict* object
107-
passed to the constructor must support those methods. This is generally
108-
accomplished by calling one of :func:`bsddb.hashopen`, :func:`bsddb.btopen` or
109-
:func:`bsddb.rnopen`. The optional *protocol* and *writeback* parameters have
110-
the same interpretation as for the :class:`Shelf` class.
105+
:meth:`previous`, :meth:`last` and :meth:`set_location` which are available
106+
in the third-party :mod:`bsddb` module from `pybsddb
107+
<http://www.jcea.es/programacion/pybsddb.htm>`_ but not in other database
108+
modules. The *dict* object passed to the constructor must support those
109+
methods. This is generally accomplished by calling one of
110+
:func:`bsddb.hashopen`, :func:`bsddb.btopen` or :func:`bsddb.rnopen`. The
111+
optional *protocol* and *writeback* parameters have the same interpretation
112+
as for the :class:`Shelf` class.
111113

112114

113115
.. class:: DbfilenameShelf(filename[, flag='c'[, protocol=None[, writeback=False]]])

‎Doc/library/weakref.rst‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,9 +59,8 @@ is exposed by the :mod:`weakref` module for the benefit of advanced uses.
5959

6060
Not all objects can be weakly referenced; those objects which can include class
6161
instances, functions written in Python (but not in C), instance methods, sets,
62-
frozensets, file objects, :term:`generator`\s, type objects, :class:`DBcursor`
63-
objects from the :mod:`bsddb` module, sockets, arrays, deques, and regular
64-
expression pattern objects.
62+
frozensets, file objects, :term:`generator`\s, type objects, sockets, arrays,
63+
deques, and regular expression pattern objects.
6564

6665
Several builtin types such as :class:`list` and :class:`dict` do not directly
6766
support weak references but can add support through subclassing::

‎Lib/test/regrtest.py‎

Lines changed: 3 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,6 @@
114114
network - It is okay to run tests that use external network
115115
resource, e.g. testing SSL support for sockets.
116116
117-
bsddb - It is okay to run the bsddb testsuite, which takes
118-
a long time to complete.
119-
120117
decimal - Test the decimal module against a large suite that
121118
verifies compliance with standards.
122119
@@ -130,8 +127,8 @@
130127
gui - Run tests that require a running GUI.
131128
132129
To enable all resources except one, use '-uall,-<resource>'. For
133-
example, to run all the tests except for the bsddb tests, give the
134-
option '-uall,-bsddb'.
130+
example, to run all the tests except for the gui tests, give the
131+
option '-uall,-gui'.
135132
"""
136133

137134
import getopt
@@ -182,7 +179,7 @@
182179

183180
from test import support
184181

185-
RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network', 'bsddb',
182+
RESOURCE_NAMES = ('audio', 'curses', 'largefile', 'network',
186183
'decimal', 'compiler', 'subprocess', 'urlfetch', 'gui')
187184

188185

@@ -900,7 +897,6 @@ def printlist(x, width=70, indent=4):
900897
'win32':
901898
"""
902899
test__locale
903-
test_bsddb3
904900
test_crypt
905901
test_curses
906902
test_dbm
@@ -937,8 +933,6 @@ def printlist(x, width=70, indent=4):
937933
'mac':
938934
"""
939935
test_atexit
940-
test_bsddb
941-
test_bsddb3
942936
test_bz2
943937
test_crypt
944938
test_curses
@@ -966,7 +960,6 @@ def printlist(x, width=70, indent=4):
966960
""",
967961
'unixware7':
968962
"""
969-
test_bsddb
970963
test_epoll
971964
test_largefile
972965
test_kqueue
@@ -978,7 +971,6 @@ def printlist(x, width=70, indent=4):
978971
""",
979972
'openunix8':
980973
"""
981-
test_bsddb
982974
test_epoll
983975
test_largefile
984976
test_kqueue
@@ -991,7 +983,6 @@ def printlist(x, width=70, indent=4):
991983
'sco_sv3':
992984
"""
993985
test_asynchat
994-
test_bsddb
995986
test_fork1
996987
test_epoll
997988
test_gettext
@@ -1012,8 +1003,6 @@ def printlist(x, width=70, indent=4):
10121003
'darwin':
10131004
"""
10141005
test__locale
1015-
test_bsddb
1016-
test_bsddb3
10171006
test_curses
10181007
test_epoll
10191008
test_dbm_gnu
@@ -1025,7 +1014,6 @@ def printlist(x, width=70, indent=4):
10251014
""",
10261015
'sunos5':
10271016
"""
1028-
test_bsddb
10291017
test_curses
10301018
test_dbm
10311019
test_epoll
@@ -1038,7 +1026,6 @@ def printlist(x, width=70, indent=4):
10381026
""",
10391027
'hp-ux11':
10401028
"""
1041-
test_bsddb
10421029
test_curses
10431030
test_epoll
10441031
test_dbm_gnu
@@ -1068,7 +1055,6 @@ def printlist(x, width=70, indent=4):
10681055
""",
10691056
'cygwin':
10701057
"""
1071-
test_bsddb3
10721058
test_curses
10731059
test_dbm
10741060
test_epoll
@@ -1082,7 +1068,6 @@ def printlist(x, width=70, indent=4):
10821068
'os2emx':
10831069
"""
10841070
test_audioop
1085-
test_bsddb3
10861071
test_curses
10871072
test_epoll
10881073
test_kqueue
@@ -1096,8 +1081,6 @@ def printlist(x, width=70, indent=4):
10961081
""",
10971082
'freebsd4':
10981083
"""
1099-
test_bsddb
1100-
test_bsddb3
11011084
test_epoll
11021085
test_dbm_gnu
11031086
test_locale
@@ -1115,8 +1098,6 @@ def printlist(x, width=70, indent=4):
11151098
""",
11161099
'aix5':
11171100
"""
1118-
test_bsddb
1119-
test_bsddb3
11201101
test_bz2
11211102
test_epoll
11221103
test_dbm_gnu
@@ -1132,8 +1113,6 @@ def printlist(x, width=70, indent=4):
11321113
""",
11331114
'openbsd3':
11341115
"""
1135-
test_bsddb
1136-
test_bsddb3
11371116
test_ctypes
11381117
test_epoll
11391118
test_dbm_gnu
@@ -1149,8 +1128,6 @@ def printlist(x, width=70, indent=4):
11491128
""",
11501129
'netbsd3':
11511130
"""
1152-
test_bsddb
1153-
test_bsddb3
11541131
test_ctypes
11551132
test_curses
11561133
test_epoll

‎Makefile.pre.in‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -840,7 +840,7 @@ LIBSUBDIRS= tkinter site-packages test test/output test/data \
840840
email email/mime email/test email/test/data \
841841
html json json/tests http dbm xmlrpc \
842842
sqlite3 sqlite3/test \
843-
logging bsddb bsddb/test csv wsgiref urllib \
843+
logging csv wsgiref urllib \
844844
lib2to3 lib2to3/fixes lib2to3/pgen2 lib2to3/tests \
845845
lib2to3/tests/data lib2to3/tests/data/fixers lib2to3/tests/data/fixers/myfixes \
846846
ctypes ctypes/test ctypes/macholib idlelib idlelib/Icons \

‎Misc/RPM/python-3.1.spec‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,6 @@ rm -f mainpkg.files tools.files
360360
%{__prefix}/%{libdirname}/python%{libvers}/email/mime
361361
%{__prefix}/%{libdirname}/python%{libvers}/sqlite3
362362
%{__prefix}/%{libdirname}/python%{libvers}/compiler
363-
%{__prefix}/%{libdirname}/python%{libvers}/bsddb
364363
%{__prefix}/%{libdirname}/python%{libvers}/hotshot
365364
%{__prefix}/%{libdirname}/python%{libvers}/logging
366365
%{__prefix}/%{libdirname}/python%{libvers}/lib-old

‎Misc/valgrind-python.supp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66
# cd python/dist/src
77
# valgrind --tool=memcheck --suppressions=Misc/valgrind-python.supp \
8-
# ./python -E ./Lib/test/regrtest.py -u bsddb,network
8+
# ./python -E ./Lib/test/regrtest.py -u gui,network
99
#
1010
# You must edit Objects/obmalloc.c and uncomment Py_USING_MEMORY_DEBUGGER
1111
# to use the preferred suppressions with Py_ADDRESS_IN_RANGE.

‎Modules/Setup.dist‎

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -324,25 +324,6 @@ _symtable symtablemodule.c
324324
#_gdbm _gdbmmodule.c -I/usr/local/include -L/usr/local/lib -lgdbm
325325

326326

327-
# Sleepycat Berkeley DB interface.
328-
#
329-
# This requires the Sleepycat DB code, see http://www.sleepycat.com/
330-
# The earliest supported version of that library is 3.0, the latest
331-
# supported version is 4.0 (4.1 is specifically not supported, as that
332-
# changes the semantics of transactional databases). A list of available
333-
# releases can be found at
334-
#
335-
# http://www.sleepycat.com/update/index.html
336-
#
337-
# Edit the variables DB and DBLIBVERto point to the db top directory
338-
# and the subdirectory of PORT where you built it.
339-
#DB=/usr/local/BerkeleyDB.4.0
340-
#DBLIBVER=4.0
341-
#DBINC=$(DB)/include
342-
#DBLIB=$(DB)/lib
343-
#_bsddb _bsddb.c -I$(DBINC) -L$(DBLIB) -ldb-$(DBLIBVER)
344-
345-
346327
# Helper module for various ascii-encoders
347328
#binascii binascii.c
348329

‎PC/VS7.1/python.build‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<excludeprojects>
1313
<include name="_tkinter.vcproj" />
1414
<include name="bz2.vcproj" />
15-
<include name="_bsddb.vcproj" />
1615
<include name="_sqlite3.vcproj" />
1716
<include name="_ssl.vcproj" />
1817
</excludeprojects>

‎PC/VS7.1/python.iss‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@ Source: libs\_testcapi.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Comp
137137
Source: DLLs\_tkinter.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: tk
138138
Source: libs\_tkinter.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: tk
139139

140-
Source: DLLs\bsddb.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main
141-
Source: libs\bsddb.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main
142-
143140
Source: DLLs\mmap.pyd; DestDir: {app}\DLLs; CopyMode: alwaysoverwrite; Components: main
144141
Source: libs\mmap.lib; DestDir: {app}\libs; CopyMode: alwaysoverwrite; Components: main
145142

‎PC/VS7.1/python20.wse‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1753,11 +1753,6 @@ item: Install File
17531753
Destination=%MAINDIR%\DLLs\_socket.pyd
17541754
Flags=0000000000000010
17551755
end
1756-
item: Install File
1757-
Source=.\_bsddb.pyd
1758-
Destination=%MAINDIR%\DLLs\_bsddb.pyd
1759-
Flags=0000000000000010
1760-
end
17611756
item: Install File
17621757
Source=.\bz2.pyd
17631758
Destination=%MAINDIR%\DLLs\bz2.pyd
@@ -1850,11 +1845,6 @@ item: Install File
18501845
Destination=%MAINDIR%\libs\_socket.lib
18511846
Flags=0000000000000010
18521847
end
1853-
item: Install File
1854-
Source=.\_bsddb.lib
1855-
Destination=%MAINDIR%\libs\_bsddb.lib
1856-
Flags=0000000000000010
1857-
end
18581848
item: Install File
18591849
Source=.\bz2.lib
18601850
Destination=%MAINDIR%\libs\bz2.lib
@@ -1939,14 +1929,6 @@ item: Install File
19391929
end
19401930
item: Remark
19411931
end
1942-
item: Install File
1943-
Source=..\lib\bsddb\*.py
1944-
Destination=%MAINDIR%\Lib\bsddb
1945-
Description=Berkeley database package
1946-
Flags=0000000100000010
1947-
end
1948-
item: Remark
1949-
end
19501932
item: Install File
19511933
Source=..\lib\compiler\*.py
19521934
Destination=%MAINDIR%\Lib\compiler

0 commit comments

Comments
 (0)