Skip to content

Commit 13be3e0

Browse files
committed
Ensure class functions have necessary variables
Was missing some 'self' and other kwarg variables. Also linted using black.
1 parent 62893ab commit 13be3e0

File tree

2 files changed

+22
-17
lines changed

2 files changed

+22
-17
lines changed

xarray/backends/api.py

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -471,14 +471,14 @@ def maybe_decode_store(store, lock=False):
471471
store = filename_or_obj
472472

473473
if isinstance(filename_or_obj, MutableMapping):
474-
if engine == 'zarr':
474+
if engine == "zarr":
475475
# on ZarrStore, mode='r', synchronizer=None, group=None,
476476
# consolidated=False.
477-
overwrite_encoded_chunks = backend_kwargs.pop("overwrite_encoded_chunks", None)
477+
overwrite_encoded_chunks = backend_kwargs.pop(
478+
"overwrite_encoded_chunks", None
479+
)
478480
store = backends.ZarrStore.open_group(
479-
filename_or_obj,
480-
group=group,
481-
**backend_kwargs
481+
filename_or_obj, group=group, **backend_kwargs
482482
)
483483

484484
elif isinstance(filename_or_obj, str):
@@ -508,14 +508,14 @@ def maybe_decode_store(store, lock=False):
508508
store = backends.CfGribDataStore(
509509
filename_or_obj, lock=lock, **backend_kwargs
510510
)
511-
elif engine == 'zarr':
511+
elif engine == "zarr":
512512
# on ZarrStore, mode='r', synchronizer=None, group=None,
513513
# consolidated=False.
514-
overwrite_encoded_chunks = backend_kwargs.pop("overwrite_encoded_chunks", None)
514+
overwrite_encoded_chunks = backend_kwargs.pop(
515+
"overwrite_encoded_chunks", None
516+
)
515517
store = backends.ZarrStore.open_group(
516-
filename_or_obj,
517-
group=group,
518-
**backend_kwargs
518+
filename_or_obj, group=group, **backend_kwargs
519519
)
520520
else:
521521
if engine not in [None, "scipy", "h5netcdf"]:
@@ -541,7 +541,8 @@ def maybe_decode_store(store, lock=False):
541541

542542
if chunks is not None:
543543
from dask.base import tokenize
544-
if engine != 'zarr':
544+
545+
if engine != "zarr":
545546

546547
# if passed an actual file path, augment the token with
547548
# the file modification time
@@ -579,7 +580,10 @@ def maybe_decode_store(store, lock=False):
579580
if isinstance(chunks, int):
580581
chunks = dict.fromkeys(ds.dims, chunks)
581582

582-
variables = {k: backends.ZarrStore.open_group.maybe_chunk(k, v, chunks) for k, v in ds.variables.items()}
583+
variables = {
584+
k: store.maybe_chunk(k, v, chunks, overwrite_encoded_chunks)
585+
for k, v in ds.variables.items()
586+
}
583587
ds2 = ds._replace_vars_and_dims(variables)
584588
return ds2
585589
else:

xarray/backends/zarr.py

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,7 @@ def encode_variable(self, variable):
358358
def encode_attribute(self, a):
359359
return encode_zarr_attr_value(a)
360360

361-
362-
def get_chunk(name, var, chunks):
361+
def get_chunk(self, name, var, chunks):
363362
chunk_spec = dict(zip(var.dims, var.encoding.get("chunks")))
364363

365364
# Coordinate labels aren't chunked
@@ -388,15 +387,17 @@ def get_chunk(name, var, chunks):
388387
chunk_spec[dim] = chunks[dim]
389388
return chunk_spec
390389

391-
def maybe_chunk(name, var, chunks):
392-
chunk_spec = get_chunk(name, var, chunks)
390+
def maybe_chunk(self, name, var, chunks, overwrite_encoded_chunks):
391+
chunk_spec = self.get_chunk(name, var, chunks)
393392

394393
if (var.ndim > 0) and (chunk_spec is not None):
394+
from dask.base import tokenize
395+
395396
# does this cause any data to be read?
396397
token2 = tokenize(name, var._data)
397398
name2 = "zarr-%s" % token2
398399
var = var.chunk(chunk_spec, name=name2, lock=None)
399-
if overwrite_encoded_chunks and var.chunks is not None:
400+
if open_kwargs["overwrite_encoded_chunks"] and var.chunks is not None:
400401
var.encoding["chunks"] = tuple(x[0] for x in var.chunk)
401402
return var
402403

0 commit comments

Comments
 (0)