summaryrefslogtreecommitdiffstats
path: root/Lib/bsddb/test/test_dbshelve.py
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2003-01-28 17:20:44 (GMT)
committerBarry Warsaw <barry@python.org>2003-01-28 17:20:44 (GMT)
commitf71de3e9a017d698be8ee4db3e2ec5fbc68bfc8c (patch)
treeb31170225a2c763246014d72e4d5db8b31fc5354 /Lib/bsddb/test/test_dbshelve.py
parenta6ae9a2128a85301ded9381c181539720ce82ca0 (diff)
downloadcpython-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_dbshelve.py')
-rw-r--r--Lib/bsddb/test/test_dbshelve.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/Lib/bsddb/test/test_dbshelve.py b/Lib/bsddb/test/test_dbshelve.py
index 900ec8e..7491cb7 100644
--- a/Lib/bsddb/test/test_dbshelve.py
+++ b/Lib/bsddb/test/test_dbshelve.py
@@ -8,7 +8,12 @@ from pprint import pprint
from types import *
import unittest
-from bsddb import dbshelve, db
+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_all import verbose