summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_bool.py
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2006-08-17 20:24:18 (GMT)
committerGuido van Rossum <guido@python.org>2006-08-17 20:24:18 (GMT)
commitbf12cdbb2880eb402f65ce8d1db09caa84c6b801 (patch)
tree47ed0e14f7243d2431abe12a352b3cce04a779f5 /Lib/test/test_bool.py
parent3b271054d7b2300d94f7f1bd3cb48d513d371c70 (diff)
downloadcpython-bf12cdbb2880eb402f65ce8d1db09caa84c6b801.zip
cpython-bf12cdbb2880eb402f65ce8d1db09caa84c6b801.tar.gz
cpython-bf12cdbb2880eb402f65ce8d1db09caa84c6b801.tar.bz2
Quite a few fixes to make the library and test suite more robust when
cPickle cannot be imported. This was necessary because my last mass checkin broke cPickle and I don't feel like debugging it right now; but it seems a good idea in general not to require cPickle when pickle.py is also there. A few unrelated fixes for issues while debigging various test failures. setup.py: disable building of cPickle until I've fixed it Objects/... genobject.c: disallow raising string exceptions Lib/... Cookie.py: fix doctest not to fail if cPickle is missing ctypes/macholib/dyld.py: fix relative imports sqlite3/__init__.py: fix relative import xml/dom/__init__.py: fix relative import Lib/test/... regrtest.py: reduce list of skipped items on darwin test_generators.py: don't test string exceptions; test throw() errors test_traceback.py: don't test string exceptions pickletester.py: don't fail if cPickle is missing test_datetime.py: don't fail if cPickle is missing test_descr.py: don't fail if cPickle is missing (still some other failures) test_exceptions.py: don't fail if cPickle is missing test_re.py: don't fail if cPickle is missing test_array.py: use pickle, not cPickle test_bool.py: don't fail if cPickle is missing test_deque.py: use pickle, not cPickle test_logging.py: use pickle, not cPickle
Diffstat (limited to 'Lib/test/test_bool.py')
-rw-r--r--Lib/test/test_bool.py25
1 files changed, 19 insertions, 6 deletions
diff --git a/Lib/test/test_bool.py b/Lib/test/test_bool.py
index 33185a0..663417d 100644
--- a/Lib/test/test_bool.py
+++ b/Lib/test/test_bool.py
@@ -289,14 +289,23 @@ class BoolTest(unittest.TestCase):
self.assertIs(pickle.loads(pickle.dumps(False, True)), False)
def test_cpickle(self):
- import cPickle
+ try:
+ import cPickle
+ except ImportError:
+ return # Just ignore this if cPickle doesn't exist
+
self.assertIs(cPickle.loads(cPickle.dumps(True)), True)
self.assertIs(cPickle.loads(cPickle.dumps(False)), False)
self.assertIs(cPickle.loads(cPickle.dumps(True, True)), True)
self.assertIs(cPickle.loads(cPickle.dumps(False, True)), False)
def test_mixedpickle(self):
- import pickle, cPickle
+ import pickle
+ try:
+ import cPickle
+ except ImportError:
+ return # Just ignore this if cPickle doesn't exist
+
self.assertIs(pickle.loads(cPickle.dumps(True)), True)
self.assertIs(pickle.loads(cPickle.dumps(False)), False)
self.assertIs(pickle.loads(cPickle.dumps(True, True)), True)
@@ -308,15 +317,19 @@ class BoolTest(unittest.TestCase):
self.assertIs(cPickle.loads(pickle.dumps(False, True)), False)
def test_picklevalues(self):
- import pickle, cPickle
-
# Test for specific backwards-compatible pickle values
+ import pickle
self.assertEqual(pickle.dumps(True), "I01\n.")
self.assertEqual(pickle.dumps(False), "I00\n.")
- self.assertEqual(cPickle.dumps(True), "I01\n.")
- self.assertEqual(cPickle.dumps(False), "I00\n.")
self.assertEqual(pickle.dumps(True, True), "I01\n.")
self.assertEqual(pickle.dumps(False, True), "I00\n.")
+
+ try:
+ import cPickle
+ except ImportError:
+ return # Just ignore the rest if cPickle doesn't exist
+ self.assertEqual(cPickle.dumps(True), "I01\n.")
+ self.assertEqual(cPickle.dumps(False), "I00\n.")
self.assertEqual(cPickle.dumps(True, True), "I01\n.")
self.assertEqual(cPickle.dumps(False, True), "I00\n.")