Allow asking for a key of obs when use_raw=True in deprecated _get_{obs,var}_array (#176)

Part of scverse/scanpy#728 and releasing v0.6.22

Author: ivirshup

anndata/core/anndata.py

@@ -1529,19 +1529,19 @@ def var_vector(
     def _get_obs_array(self, k, use_raw=False, layer=None):
         """Get an array from the layer (default layer='X') along the observation dimension by first looking up
         obs.keys and then var.index."""
-        if use_raw:
-            return self.raw.obs_vector(k)
-        else:
+        if not use_raw or k in self.obs.columns:
             return self.obs_vector(k=k, layer=layer)
+        else:
+            return self.raw.obs_vector(k)
 
     @utils.deprecated("var_vector")
     def _get_var_array(self, k, use_raw=False, layer=None):
         """Get an array from the layer (default layer='X') along the variables dimension by first looking up
         ``var.keys`` and then ``obs.index``."""
-        if use_raw:
-            return self.raw.var_vector(k)
-        else:
+        if not use_raw or k in self.var.columns:
             return self.var_vector(k=k, layer=layer)
+        else:
+            return self.raw.var_vector(k)
 
     def copy(self, filename: Optional[PathLike] = None) -> 'AnnData':
         """Full copy, optionally on disk."""