summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Heimes <christian@cheimes.de>2008-01-28 18:36:44 (GMT)
committerChristian Heimes <christian@cheimes.de>2008-01-28 18:36:44 (GMT)
commit087f8ae4cf34ec7653656f6d4a210bf2a532af9b (patch)
treec3c67c84cb83583577523260a59eb52392b43d74
parentfa767efe0662c7927e644747fa08c083f01b0653 (diff)
downloadcpython-087f8ae4cf34ec7653656f6d4a210bf2a532af9b.zip
cpython-087f8ae4cf34ec7653656f6d4a210bf2a532af9b.tar.gz
cpython-087f8ae4cf34ec7653656f6d4a210bf2a532af9b.tar.bz2
Fixed two bugs in the bsddb tests. One was reported as #1956
-rw-r--r--Lib/bsddb/test/test_compare.py2
-rw-r--r--Lib/bsddb/test/test_thread.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/bsddb/test/test_compare.py b/Lib/bsddb/test/test_compare.py
index eefc7c2..a36faae 100644
--- a/Lib/bsddb/test/test_compare.py
+++ b/Lib/bsddb/test/test_compare.py
@@ -6,7 +6,7 @@ import shutil
import sys, os, re
from io import StringIO
import tempfile
-import test_all
+from . import test_all
import unittest
try:
diff --git a/Lib/bsddb/test/test_thread.py b/Lib/bsddb/test/test_thread.py
index a347911..20a643b 100644
--- a/Lib/bsddb/test/test_thread.py
+++ b/Lib/bsddb/test/test_thread.py
@@ -51,7 +51,7 @@ class BaseThreadedTestCase(unittest.TestCase):
self.homeDir = homeDir
try:
os.mkdir(homeDir)
- except OSError, e:
+ except OSError as e:
if e.errno != errno.EEXIST: raise
self.env = db.DBEnv()
self.setEnvOpts()
@@ -68,7 +68,7 @@ class BaseThreadedTestCase(unittest.TestCase):
self.env.close()
try:
shutil.rmtree(self.homeDir)
- except OSError, e:
+ except OSError as e:
if e.errno != errno.EEXIST: raise
def setEnvOpts(self):