]> granicus.if.org Git - python/commitdiff
Make test_datetime.py pass by killing all references to cPickle in it.
authorGuido van Rossum <guido@python.org>
Thu, 19 Jul 2007 23:55:34 +0000 (23:55 +0000)
committerGuido van Rossum <guido@python.org>
Thu, 19 Jul 2007 23:55:34 +0000 (23:55 +0000)
Lib/test/test_datetime.py

index cf7051bc0df8bca4f1990bdbeaf0f29a43ae2491..c0a96efdc97e0a9846ea2e1269e8c7b7f5fc5b51 100644 (file)
@@ -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.