summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2007-07-19 23:55:34 (GMT)
committerGuido van Rossum <guido@python.org>2007-07-19 23:55:34 (GMT)
commitbe6fe5476cc3233ac20e02c0063355a5884663f7 (patch)
treeb6589e3cebc2aa3067e6e43b69c3e7f7ee81cb7e
parentf93254d2992896445cbd1eec0ee4a80eb8edc6b8 (diff)
downloadcpython-be6fe5476cc3233ac20e02c0063355a5884663f7.zip
cpython-be6fe5476cc3233ac20e02c0063355a5884663f7.tar.gz
cpython-be6fe5476cc3233ac20e02c0063355a5884663f7.tar.bz2
Make test_datetime.py pass by killing all references to cPickle in it.
-rw-r--r--Lib/test/test_datetime.py16
1 files changed, 2 insertions, 14 deletions
diff --git a/Lib/test/test_datetime.py b/Lib/test/test_datetime.py
index cf7051b..c0a96ef 100644
--- a/Lib/test/test_datetime.py
+++ b/Lib/test/test_datetime.py
@@ -7,10 +7,6 @@ import os
import sys
import pickle
import unittest
-try:
- import cPickle
-except ImportError:
- cPickle = None
from test import test_support
@@ -20,16 +16,8 @@ from datetime import tzinfo
from datetime import time
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)]
-if cPickle is None:
- assert len(pickle_choices) == 3
-else:
- assert len(pickle_choices) == 2*2*3
+pickle_choices = [(pickle, pickle, proto) for proto in range(3)]
+assert len(pickle_choices) == 3
# An arbitrary collection of objects of non-datetime types, for testing
# mixed-type comparisons.