~vcs-imports/kupfer/master-new

« back to all changes in this revision

Viewing changes to kupfer/core/sources.py

  • Committer: Ulrik Sverdrup
  • Date: 2010-02-10 22:59:54 UTC
  • Revision ID: git-v1:e2e393fa2912d1fbd3b7bf9054a2228d492806c6
core: Use the safest unpickler for plugin configuration data

Show diffs side-by-side

added added

removed removed

Lines of Context:
10
10
import time
11
11
 
12
12
from kupfer import config, pretty, scheduler
 
13
from kupfer import conspickle
13
14
from kupfer.obj import base, sources
14
15
from kupfer.core import pluginload
15
16
 
201
202
                except IOError, e:
202
203
                        return None
203
204
                try:
204
 
                        data = pickle.load(pfile)
 
205
                        data = conspickle.BasicUnpickler.loads(pfile.read())
205
206
                        sname = os.path.basename(pickle_file)
206
207
                        self.output_debug("Loaded configuration from", sname)
207
208
                        self.output_debug(data)