Fix cf contexts

Author: stefraynaud

doc/uses.cf.rst

@@ -25,7 +25,7 @@ It has two intents:
 The module offers capabilities for the user to extend and specialize
 default behaviors for user's special datasets.
 
-:mod:`xoa` makes available **ready-to-use configurations** for decoding and encoding a few **standard dataset types**. 
+:mod:`xoa` provides **ready-to-use configurations** for decoding and encoding a few **standard dataset types**. 
 Look at :ref:`appendix.cf.specialized`.
 
 
@@ -37,10 +37,10 @@ Look at :ref:`appendix.cf.specialized`.
     - The current module is also designed for data variables an dimensions, not only
       coordinates.
     - It searches for items not only using standard_names but also
-      specialized names. It means that **it works even of datasets are not well formatted**.
+      specialized names. It means that **it works even with datasets that are not well formatted**.
     - It is not only available as accessors, but also as independant
-      objects that can be configured for each type of dataset or in
-      contexts by the user.
+      specification objects that can be configured by the user
+      for each type of dataset.
 
 
 

xoa/cf.py

@@ -3435,7 +3435,7 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_value, traceback):
         if self.old_specs is None:
-            del self.cf_cache["current"]
+            self.cf_cache["current"] = None
         else:
             self.cf_cache["current"] = self.old_specs
 
@@ -3457,7 +3457,7 @@ def reset_cache(disk=True, memory=False):
         os.remove(USER_CF_CACHE_FILE)
 
     if memory:
-        cf_cache = _get_cfgm_()
+        cf_cache = _get_cache_()
         cf_cache["loaded_dicts"].clear()
         cf_cache["current"] = None
         cf_cache["default"] = None
@@ -3650,7 +3650,7 @@ def get_cf_specs(name=None, cache="rw"):
     # Not named => current or default specs
     if name == "current":
         cf_cache = _get_cache_()
-        if cf_cache["current"] is None:
+        if cf_cache.get("current") is None:
             cf_cache["current"] = get_default_cf_specs()
         cfspecs = cf_cache["current"]
     else:
@@ -3839,7 +3839,7 @@ def infer_cf_specs(ds, named=False, from_attrs=True, from_score=False):
         if best_score != -1:
             return best_cfspecs
 
-    # Fallback to default specs
+    # Fallback to current specs
     cfspecs = get_cf_specs("current")
     if named and not cfspecs.name:
         return