[Python-3000-checkins] r56462 - python/branches/py3k-struni/Lib/test/test_datetime.py

[guido.van.rossum]

Author: guido.van.rossum
Date: Fri Jul 20 01:55:34 2007
New Revision: 56462

Modified:
   python/branches/py3k-struni/Lib/test/test_datetime.py
Log:
Make test_datetime.py pass by killing all references to cPickle in it.


Modified: python/branches/py3k-struni/Lib/test/test_datetime.py
==============================================================================
--- python/branches/py3k-struni/Lib/test/test_datetime.py	(original)
+++ python/branches/py3k-struni/Lib/test/test_datetime.py	Fri Jul 20 01:55:34 2007
@@ -7,10 +7,6 @@
 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 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.