summaryrefslogtreecommitdiffstats
path: root/Lib/test/test_datetime.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_datetime.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_datetime.py')
-rw-r--r--Lib/test/test_datetime.py12
1 files changed, 10 insertions, 2 deletions
diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py
index 203bea1..4f765c1 100644
--- a/Lib/test/test_datetime.py
+++ b/Lib/test/test_datetime.py
@@ -5,8 +5,11 @@ See http://www.zope.org/Members/fdrake/DateTimeWiki/TestCases
import sys
import pickle
-import cPickle
import unittest
+try:
+ import cPickle
+except ImportError:
+ cPickle = None
from test import test_support
@@ -18,9 +21,14 @@ from datetime import date, datetime
pickle_choices = [(pickler, unpickler, proto)
for pickler in pickle, cPickle
+ if pickler is not None
for unpickler in pickle, cPickle
+ if unpickler is not None
for proto in range(3)]
-assert len(pickle_choices) == 2*2*3
+if cPickle is None:
+ assert len(pickle_choices) == 3
+else:
+ assert len(pickle_choices) == 2*2*3
# An arbitrary collection of objects of non-datetime types, for testing
# mixed-type comparisons.