# HG changeset patch # User Sean Farley # Date 1392451087 21600 # Node ID 9ec3c2e89c9437323b45df0af2b7baed0e094b0d # Parent d1bd52202c6dfe7efaf333be353bec6c49a4c948 util: banish pickle to compathacks diff --git a/hgsubversion/compathacks.py b/hgsubversion/compathacks.py --- a/hgsubversion/compathacks.py +++ b/hgsubversion/compathacks.py @@ -10,3 +10,8 @@ def branchset(repo): return set(repo.branchmap()) except AttributeError: return set(repo.branchtags()) + +def pickle_load(f): + import cPickle as pickle + f.seek(0) + return pickle.load(f) diff --git a/hgsubversion/util.py b/hgsubversion/util.py --- a/hgsubversion/util.py +++ b/hgsubversion/util.py @@ -1,4 +1,4 @@ -import cPickle as pickle +import compathacks import errno import re import os @@ -192,8 +192,7 @@ def load(file_path): f.close() except ValueError: # Ok, JSON couldn't be loaded, so we'll try the old way of using pickle - f.seek(0) - data = pickle.load(f) + data = compathacks.pickle_load(f) # convert the file to json immediately f.close()