init: Don't always dump auto_load_var_names->file

This should only be done in save_variable when auto_load is True.
sergeio · Oct 13, 2012 · 9981a80 · 9981a80
1 parent c47f210
commit 9981a80
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/__init__.py b/__init__.py
@@ -10,12 +10,13 @@ def save_variable(name, var, auto_load=True):
 
     """
     if auto_load:
-        load_all_variables(['auto_load_var_names'])
-        __builtins__.setdefault('auto_load_var_names', [])
+        if not _load_variable('auto_load_var_names'):
+            __builtins__.setdefault('auto_load_var_names', set())
         auto_load_var_names = __builtins__.get('auto_load_var_names')
         auto_load_var_names.add(name)
+        pickle.dump(auto_load_var_names, open('auto_load_var_names.pkl', 'wb'))
+
     pickle.dump(var, open(name + '.pkl', 'wb'))
-    pickle.dump(auto_load_var_names, open('auto_load_var_names.pkl', 'wb'))
 
 
 def _load_variable(name):