# HG changeset patch
# User Sean Farley <sean.michael.farley@gmail.com>
# Date 1377273429 18000
# Node ID 063cae4e35af9b095d98771d0429e00885622a69
# Parent  2922f4881a046288732093856e7b6123e13f7012
layouts: use util.load instead of bare pickle

diff --git a/hgsubversion/layouts/standard.py b/hgsubversion/layouts/standard.py
--- a/hgsubversion/layouts/standard.py
+++ b/hgsubversion/layouts/standard.py
@@ -1,5 +1,4 @@
 import os.path
-import pickle
 
 import base
 
@@ -67,12 +66,9 @@ class StandardLayout(base.BaseLayout):
         if self._tag_locations is None:
 
             tag_locations_file = os.path.join(meta_data_dir, 'tag_locations')
+            self._tag_locations = util.load(tag_locations_file)
 
-            if os.path.exists(tag_locations_file):
-                f = open(tag_locations_file)
-                self._tag_locations = pickle.load(f)
-                f.close()
-            else:
+            if not self._tag_locations:
                 self._tag_locations = self.ui.configlist('hgsubversion',
                                                         'tagpaths',
                                                         ['tags'])