[Python-3000-checkins] r55248 - in python/branches/p3yk: Doc/lib/libbsddb.tex Doc/lib/libundoc.tex Lib/test/regrtest.py Lib/test/test_bsddb185.py Misc/NEWS PC/os2emx/Makefile PC/os2emx/config.c README setup.py
neal.norwitz
python-3000-checkins at python.org
Fri May 11 09:29:07 CEST 2007
Author: neal.norwitz
Date: Fri May 11 09:29:05 2007
New Revision: 55248
Removed:
python/branches/p3yk/Lib/test/test_bsddb185.py
Modified:
python/branches/p3yk/Doc/lib/libbsddb.tex
python/branches/p3yk/Doc/lib/libundoc.tex
python/branches/p3yk/Lib/test/regrtest.py
python/branches/p3yk/Misc/NEWS
python/branches/p3yk/PC/os2emx/Makefile
python/branches/p3yk/PC/os2emx/config.c
python/branches/p3yk/README
python/branches/p3yk/setup.py
Log:
Remove bsddb185 support.
Modified: python/branches/p3yk/Doc/lib/libbsddb.tex
==============================================================================
--- python/branches/p3yk/Doc/lib/libbsddb.tex (original)
+++ python/branches/p3yk/Doc/lib/libbsddb.tex Fri May 11 09:29:05 2007
@@ -94,14 +94,6 @@
\end{funcdesc}
-\begin{notice}
-Beginning in 2.3 some \UNIX{} versions of Python may have a \module{bsddb185}
-module. This is present \emph{only} to allow backwards compatibility with
-systems which ship with the old Berkeley DB 1.85 database library. The
-\module{bsddb185} module should never be used directly in new code.
-\end{notice}
-
-
\begin{seealso}
\seemodule{dbhash}{DBM-style interface to the \module{bsddb}}
\end{seealso}
Modified: python/branches/p3yk/Doc/lib/libundoc.tex
==============================================================================
--- python/branches/p3yk/Doc/lib/libundoc.tex (original)
+++ python/branches/p3yk/Doc/lib/libundoc.tex Fri May 11 09:29:05 2007
@@ -47,12 +47,6 @@
\item[\module{posixpath}]
--- Implementation of \module{os.path} on \POSIX.
-\item[\module{bsddb185}]
---- Backwards compatibility module for systems which still use the Berkeley
- DB 1.85 module. It is normally only available on certain BSD \UNIX-based
- systems. It should never be used directly.
-\end{description}
-
\section{Multimedia}
Modified: python/branches/p3yk/Lib/test/regrtest.py
==============================================================================
--- python/branches/p3yk/Lib/test/regrtest.py (original)
+++ python/branches/p3yk/Lib/test/regrtest.py Fri May 11 09:29:05 2007
@@ -819,7 +819,6 @@
test__locale
test_applesingle
test_al
- test_bsddb185
test_bsddb3
test_cd
test_cl
@@ -857,7 +856,6 @@
"""
test_al
test_applesingle
- test_bsddb185
test_cd
test_cl
test_curses
@@ -878,7 +876,6 @@
test_al
test_atexit
test_bsddb
- test_bsddb185
test_bsddb3
test_bz2
test_cd
@@ -922,7 +919,6 @@
test_al
test_applesingle
test_bsddb
- test_bsddb185
test_cd
test_cl
test_dl
@@ -946,7 +942,6 @@
test_al
test_applesingle
test_bsddb
- test_bsddb185
test_cd
test_cl
test_dl
@@ -971,7 +966,6 @@
test_applesingle
test_asynchat
test_bsddb
- test_bsddb185
test_cd
test_cl
test_dl
@@ -1005,7 +999,6 @@
test_asynchat
test_atexit
test_bsddb
- test_bsddb185
test_bsddb3
test_cd
test_cl
@@ -1062,7 +1055,6 @@
test_al
test_applesingle
test_bsddb
- test_bsddb185
test_cd
test_cl
test_curses
@@ -1083,7 +1075,6 @@
test_al
test_applesingle
test_bsddb
- test_bsddb185
test_cd
test_cl
test_curses
@@ -1111,7 +1102,6 @@
"""
test_al
test_applesingle
- test_bsddb185
test_cd
test_cl
test_curses
@@ -1136,7 +1126,6 @@
"""
test_al
test_applesingle
- test_bsddb185
test_bsddb3
test_cd
test_cl
@@ -1159,7 +1148,6 @@
test_al
test_applesingle
test_audioop
- test_bsddb185
test_bsddb3
test_cd
test_cl
@@ -1222,7 +1210,6 @@
test_al
test_applesingle
test_bsddb
- test_bsddb185
test_bsddb3
test_bz2
test_cd
@@ -1284,7 +1271,6 @@
test_al
test_applesingle
test_bsddb
- test_bsddb185
test_bsddb3
test_cd
test_cl
Deleted: /python/branches/p3yk/Lib/test/test_bsddb185.py
==============================================================================
--- /python/branches/p3yk/Lib/test/test_bsddb185.py Fri May 11 09:29:05 2007
+++ (empty file)
@@ -1,43 +0,0 @@
-"""Tests for the bsddb185 module.
-
-The file 185test.db found in Lib/test/ is for testing purposes with this
-testing suite.
-
-"""
-from test.test_support import verbose, run_unittest, findfile
-import unittest
-import bsddb185
-import anydbm
-import whichdb
-import os
-import tempfile
-import shutil
-
-class Bsddb185Tests(unittest.TestCase):
-
- def test_open_existing_hash(self):
- # Verify we can open a file known to be a hash v2 file
- db = bsddb185.hashopen(findfile("185test.db"))
- self.assertEqual(db["1"], "1")
- db.close()
-
- def test_whichdb(self):
- # Verify that whichdb correctly sniffs the known hash v2 file
- self.assertEqual(whichdb.whichdb(findfile("185test.db")), "bsddb185")
-
- def test_anydbm_create(self):
- # Verify that anydbm.open does *not* create a bsddb185 file
- tmpdir = tempfile.mkdtemp()
- try:
- dbfile = os.path.join(tmpdir, "foo.db")
- anydbm.open(dbfile, "c").close()
- ftype = whichdb.whichdb(dbfile)
- self.assertNotEqual(ftype, "bsddb185")
- finally:
- shutil.rmtree(tmpdir)
-
-def test_main():
- run_unittest(Bsddb185Tests)
-
-if __name__ == "__main__":
- test_main()
Modified: python/branches/p3yk/Misc/NEWS
==============================================================================
--- python/branches/p3yk/Misc/NEWS (original)
+++ python/branches/p3yk/Misc/NEWS Fri May 11 09:29:05 2007
@@ -172,6 +172,8 @@
Library
-------
+- Remove bsddb185 module it was obsolete.
+
- Remove commands.getstatus() it was obsolete.
- Remove functions in string and strop modules that are also string methods.
Modified: python/branches/p3yk/PC/os2emx/Makefile
==============================================================================
--- python/branches/p3yk/PC/os2emx/Makefile (original)
+++ python/branches/p3yk/PC/os2emx/Makefile Fri May 11 09:29:05 2007
@@ -268,7 +268,6 @@
DESCRIPTION.crypt$(MODULE.EXT)= Python Extension DLL implementing the crypt$(BRO)$(BRC) function
DESCRIPTION._tkinter$(MODULE.EXT)= Python Extension DLL for access to Tcl/Tk Environment
DESCRIPTION.readline$(MODULE.EXT)= Python Extension DLL for access to GNU ReadLine library
-DESCRIPTION.bsddb185$(MODULE.EXT)= Python Extension DLL for access to BSD DB (v1.85) library
DESCRIPTION._curses$(MODLIB.EXT)= Python Extension DLL for access to ncurses library
DESCRIPTION.pyexpat$(MODULE.EXT)= Python Extension DLL for access to expat library
DESCRIPTION.bz2$(MODULE.EXT)= Python Extension DLL for accessing the bz2 compression library
@@ -471,9 +470,6 @@
ifeq ($(HAVE_GREADLINE),yes)
HARDEXTMODULES+= readline
endif
-ifeq ($(HAVE_BSDDB),yes)
- HARDEXTMODULES+= bsddb185
-endif
ifeq ($(HAVE_NCURSES),yes)
LIBEXTMODULES+= _curses
HARDEXTMODULES+= _curses_
@@ -600,10 +596,6 @@
unicoded$(MODULE.EXT): unicodedata$(MODULE.EXT)
cp $^ $@
-# - optional modules (requiring other software to be installed)
-bsddb185$(MODULE.EXT): $(OUT)bsddbmodule$O $(OUT)bsddb185_m.def $(PYTHON.IMPLIB)
- $(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) -ldb $(LIBS)
-
crypt$(MODULE.EXT): $(OUT)cryptmodule$O $(OUT)crypt_m.def $(PYTHON.IMPLIB)
$(LD) $(LDFLAGS.DLL) -o $@ $(^^) $(L^) -lufc $(LIBS)
Modified: python/branches/p3yk/PC/os2emx/config.c
==============================================================================
--- python/branches/p3yk/PC/os2emx/config.c (original)
+++ python/branches/p3yk/PC/os2emx/config.c Fri May 11 09:29:05 2007
@@ -81,7 +81,6 @@
extern void init_curses_panel();
extern void init_hotshot();
extern void init_testcapi();
-extern void initbsddb185();
extern void initbz2();
extern void initfpectl();
extern void initfpetest();
@@ -147,7 +146,6 @@
{"_curses_panel", init_curses_panel},
{"_hotshot", init_hotshot},
{"_testcapi", init_testcapi},
- {"bsddb185", initbsddb185},
{"bz2", initbz2},
{"fpectl", initfpectl},
{"fpetest", initfpetest},
Modified: python/branches/p3yk/README
==============================================================================
--- python/branches/p3yk/README (original)
+++ python/branches/p3yk/README Fri May 11 09:29:05 2007
@@ -290,16 +290,6 @@
submit a documentation bug report to SourceForge (see Bug Reports
above) so we can remove them!)
-Unix platforms: If your vendor still ships (and you still use) Berkeley DB
- 1.85 you will need to edit Modules/Setup to build the bsddb185
- module and add a line to sitecustomize.py which makes it the
- default. In Modules/Setup a line like
-
- bsddb185 bsddbmodule.c
-
- should work. (You may need to add -I, -L or -l flags to direct the
- compiler and linker to your include files and libraries.)
-
XXX I think this next bit is out of date:
64-bit platforms: The modules audioop, imageop and rgbimg don't work.
@@ -752,9 +742,7 @@
exposing a set of package-level functions which provide
backwards-compatible behavior. Only versions 3.3 through 4.4 of
Sleepycat's libraries provide the necessary API, so older versions
-aren't supported through this interface. The old bsddb module has
-been retained as bsddb185, though it is not built by default. Users
-wishing to use it will have to tweak Modules/Setup to build it. The
+aren't supported through this interface. The
dbm module will still be built against the Sleepycat libraries if
other preferred alternatives (ndbm, gdbm) are not found.
Modified: python/branches/p3yk/setup.py
==============================================================================
--- python/branches/p3yk/setup.py (original)
+++ python/branches/p3yk/setup.py Fri May 11 09:29:05 2007
@@ -896,32 +896,6 @@
else:
missing.append('_sqlite3')
- # Look for Berkeley db 1.85. Note that it is built as a different
- # module name so it can be included even when later versions are
- # available. A very restrictive search is performed to avoid
- # accidentally building this module with a later version of the
- # underlying db library. May BSD-ish Unixes incorporate db 1.85
- # symbols into libc and place the include file in /usr/include.
- f = "/usr/include/db.h"
- if os.path.exists(f):
- data = open(f).read()
- m = re.search(r"#s*define\s+HASHVERSION\s+2\s*", data)
- if m is not None:
- # bingo - old version used hash file format version 2
- ### XXX this should be fixed to not be platform-dependent
- ### but I don't have direct access to an osf1 platform and
- ### seemed to be muffing the search somehow
- libraries = platform == "osf1" and ['db'] or None
- if libraries is not None:
- exts.append(Extension('bsddb185', ['bsddbmodule.c'],
- libraries=libraries))
- else:
- exts.append(Extension('bsddb185', ['bsddbmodule.c']))
- else:
- missing.append('bsddb185')
- else:
- missing.append('bsddb185')
-
# The standard Unix dbm module:
if platform not in ['cygwin']:
if find_file("ndbm.h", inc_dirs, []) is not None:
More information about the Python-3000-checkins
mailing list