From ba205d6971db8ec8523e7a8f5a86422b1bfcc9f5 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Thu, 17 Aug 2006 08:57:26 +0000 Subject: [PATCH] If cPickle isn't available, use pickle. --- Lib/logging/handlers.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Lib/logging/handlers.py b/Lib/logging/handlers.py index 35529501a72..a0255cee364 100644 --- a/Lib/logging/handlers.py +++ b/Lib/logging/handlers.py @@ -27,7 +27,11 @@ Copyright (C) 2001-2004 Vinay Sajip. All Rights Reserved. To use, simply 'import logging' and log away! """ -import sys, logging, socket, types, os, string, cPickle, struct, time, glob +import sys, logging, socket, types, os, string, struct, time, glob +try: + import cPickle as pickle +except ImportError: + import pickle try: import codecs @@ -389,7 +393,7 @@ class SocketHandler(logging.Handler): if ei: dummy = self.format(record) # just to get traceback text into record.exc_text record.exc_info = None # to avoid Unpickleable error - s = cPickle.dumps(record.__dict__, 1) + s = pickle.dumps(record.__dict__, 1) if ei: record.exc_info = ei # for next handler slen = struct.pack(">L", len(s))