Skip to content

Commit 43357ea

Browse files
committed
pickle isnt needed thats py2
1 parent 611d12b commit 43357ea

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

workflow/background.py

+1-6
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,7 @@
1818

1919

2020
import os
21-
22-
try:
23-
import cPickle as pickle
24-
except:
25-
import pickle
26-
21+
import pickle
2722
import signal
2823
import subprocess
2924
import sys

workflow/workflow.py

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,7 @@
2525
import logging
2626
import logging.handlers
2727
import os
28-
29-
try:
30-
import cPickle as pickle
31-
except:
32-
import pickle
33-
28+
import pickle
3429
import plistlib
3530
import re
3631
import shutil
@@ -693,7 +688,6 @@ def dump(cls, obj, file_obj):
693688

694689
# Set up default manager and register built-in serializers
695690
manager = SerializerManager()
696-
manager.register("cpickle", PickleSerializer)
697691
manager.register("pickle", PickleSerializer)
698692
manager.register("json", JSONSerializer)
699693

@@ -1605,6 +1599,8 @@ def stored_data(self, name):
16051599
"to load this data.".format(serializer_name)
16061600
)
16071601

1602+
self.logger.debug("data `%s` stored as `%s`", name, serializer_name)
1603+
16081604
filename = "{0}.{1}".format(name, serializer_name)
16091605
data_path = self.datafile(filename)
16101606

@@ -1618,6 +1614,8 @@ def stored_data(self, name):
16181614
with open(data_path, "rb") as file_obj:
16191615
data = serializer.load(file_obj)
16201616

1617+
self.logger.debug("stored data loaded: %s", data_path)
1618+
16211619
return data
16221620

16231621
def store_data(self, name, data, serializer=None):
@@ -1687,6 +1685,8 @@ def _store():
16871685

16881686
_store()
16891687

1688+
self.logger.debug("saved data: %s", data_path)
1689+
16901690
def cached_data(self, name, data_func=None, max_age=60):
16911691
"""Return cached data if younger than ``max_age`` seconds.
16921692

0 commit comments

Comments
 (0)