diff options
| author | Guido van Rossum <guido@python.org> | 2006-08-17 20:24:18 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2006-08-17 20:24:18 +0000 |
| commit | cceea3c96e03f9bee4a64fca46fbb992b912d94f (patch) | |
| tree | 3e3b51759c21d961c14f9f8b17b511f6eb571525 /Lib/test/test_logging.py | |
| parent | 634c525223e8ae6a67ea4e0ce306bfa7cc8ab4ab (diff) | |
| download | cpython-cceea3c96e03f9bee4a64fca46fbb992b912d94f.tar.gz | |
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_logging.py')
| -rw-r--r-- | Lib/test/test_logging.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/test/test_logging.py b/Lib/test/test_logging.py index 68c23c218b..fe0512399e 100644 --- a/Lib/test/test_logging.py +++ b/Lib/test/test_logging.py @@ -25,7 +25,7 @@ Copyright (C) 2001-2002 Vinay Sajip. All Rights Reserved. """ import select -import os, sys, string, struct, types, cPickle, cStringIO +import os, sys, string, struct, types, pickle, cStringIO import socket, tempfile, threading, time import logging, logging.handlers, logging.config from test.test_support import run_with_locale @@ -70,7 +70,7 @@ class LogRecordStreamHandler(StreamRequestHandler): raise def unPickle(self, data): - return cPickle.loads(data) + return pickle.loads(data) def handleLogRecord(self, record): logname = "logrecv.tcp." + record.name |