25
25
import logging
26
26
import logging .handlers
27
27
import os
28
-
29
- try :
30
- import cPickle as pickle
31
- except :
32
- import pickle
33
-
28
+ import pickle
34
29
import plistlib
35
30
import re
36
31
import shutil
@@ -693,7 +688,6 @@ def dump(cls, obj, file_obj):
693
688
694
689
# Set up default manager and register built-in serializers
695
690
manager = SerializerManager ()
696
- manager .register ("cpickle" , PickleSerializer )
697
691
manager .register ("pickle" , PickleSerializer )
698
692
manager .register ("json" , JSONSerializer )
699
693
@@ -1605,6 +1599,8 @@ def stored_data(self, name):
1605
1599
"to load this data." .format (serializer_name )
1606
1600
)
1607
1601
1602
+ self .logger .debug ("data `%s` stored as `%s`" , name , serializer_name )
1603
+
1608
1604
filename = "{0}.{1}" .format (name , serializer_name )
1609
1605
data_path = self .datafile (filename )
1610
1606
@@ -1618,6 +1614,8 @@ def stored_data(self, name):
1618
1614
with open (data_path , "rb" ) as file_obj :
1619
1615
data = serializer .load (file_obj )
1620
1616
1617
+ self .logger .debug ("stored data loaded: %s" , data_path )
1618
+
1621
1619
return data
1622
1620
1623
1621
def store_data (self , name , data , serializer = None ):
@@ -1687,6 +1685,8 @@ def _store():
1687
1685
1688
1686
_store ()
1689
1687
1688
+ self .logger .debug ("saved data: %s" , data_path )
1689
+
1690
1690
def cached_data (self , name , data_func = None , max_age = 60 ):
1691
1691
"""Return cached data if younger than ``max_age`` seconds.
1692
1692
0 commit comments