diff options
| author | Guido van Rossum <guido@python.org> | 2007-07-20 00:22:32 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-07-20 00:22:32 (GMT) |
| commit | 99603b0c1edb4b8ca2a30fa90470170b959321ee (patch) | |
| tree | f0fef33a9c03529354c01f5fd374fd36ebc024d7 /Lib/bsddb | |
| parent | be6fe5476cc3233ac20e02c0063355a5884663f7 (diff) | |
| download | cpython-99603b0c1edb4b8ca2a30fa90470170b959321ee.zip cpython-99603b0c1edb4b8ca2a30fa90470170b959321ee.tar.gz cpython-99603b0c1edb4b8ca2a30fa90470170b959321ee.tar.bz2 | |
Getting rid of cPickle. Mmm, feels good!
Diffstat (limited to 'Lib/bsddb')
| -rw-r--r-- | Lib/bsddb/dbtables.py | 2 | ||||
| -rw-r--r-- | Lib/bsddb/test/test_dbtables.py | 6 | ||||
| -rw-r--r-- | Lib/bsddb/test/test_pickle.py | 8 |
3 files changed, 2 insertions, 14 deletions
diff --git a/Lib/bsddb/dbtables.py b/Lib/bsddb/dbtables.py index 97ea6a7..690e280 100644 --- a/Lib/bsddb/dbtables.py +++ b/Lib/bsddb/dbtables.py @@ -22,7 +22,7 @@ import sys import copy import xdrlib import random -import cPickle as pickle +import pickle try: # For Pythons w/distutils pybsddb diff --git a/Lib/bsddb/test/test_dbtables.py b/Lib/bsddb/test/test_dbtables.py index a7c2c27..0701cca 100644 --- a/Lib/bsddb/test/test_dbtables.py +++ b/Lib/bsddb/test/test_dbtables.py @@ -21,11 +21,7 @@ # $Id$ import sys, os, re -try: - import cPickle - pickle = cPickle -except ImportError: - import pickle +import pickle import tempfile import unittest diff --git a/Lib/bsddb/test/test_pickle.py b/Lib/bsddb/test/test_pickle.py index 95cb23d..a5ccfa3 100644 --- a/Lib/bsddb/test/test_pickle.py +++ b/Lib/bsddb/test/test_pickle.py @@ -1,10 +1,6 @@ import sys, os import pickle -try: - import cPickle -except ImportError: - cPickle = None import unittest import glob @@ -62,10 +58,6 @@ class pickleTestCase(unittest.TestCase): def test01_pickle_DBError(self): self._base_test_pickle_DBError(pickle=pickle) - if cPickle: - def test02_cPickle_DBError(self): - self._base_test_pickle_DBError(pickle=cPickle) - #---------------------------------------------------------------------- def test_suite(): |