diff options
| author | Barry Warsaw <barry@python.org> | 2003-01-28 17:20:44 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 2003-01-28 17:20:44 (GMT) |
| commit | f71de3e9a017d698be8ee4db3e2ec5fbc68bfc8c (patch) | |
| tree | b31170225a2c763246014d72e4d5db8b31fc5354 /Lib/bsddb/test/test_misc.py | |
| parent | a6ae9a2128a85301ded9381c181539720ce82ca0 (diff) | |
| download | cpython-f71de3e9a017d698be8ee4db3e2ec5fbc68bfc8c.zip cpython-f71de3e9a017d698be8ee4db3e2ec5fbc68bfc8c.tar.gz cpython-f71de3e9a017d698be8ee4db3e2ec5fbc68bfc8c.tar.bz2 | |
Everything worked in both the distutils distro and in Python 2.3cvs,
so merge from the bsddb-bsddb3-schizo-branch back to the trunk.
Diffstat (limited to 'Lib/bsddb/test/test_misc.py')
| -rw-r--r-- | Lib/bsddb/test/test_misc.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/bsddb/test/test_misc.py b/Lib/bsddb/test/test_misc.py index 24c3fc6..7f7a6ee 100644 --- a/Lib/bsddb/test/test_misc.py +++ b/Lib/bsddb/test/test_misc.py @@ -5,8 +5,12 @@ import os import sys import unittest -from bsddb import db -from bsddb import dbshelve +try: + # For Python 2.3 + from bsddb import db, dbshelve +except ImportError: + # For earlier Pythons w/distutils pybsddb + from bsddb3 import db, dbshelve from test.test_support import verbose |