Skip to content

Commit c5546d7

Browse files
committed
Remove some Best Practice issues
1 parent 853d178 commit c5546d7

4 files changed

Lines changed: 12 additions & 4 deletions

File tree

Stoner/core/property.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def data(self, value):
8585
nv = ma.atleast_2d(nv)
8686
elif nv.ndim == 1: # nv is a vector - make it a 2D array
8787
nv = ma.atleast_2d(nv).T
88-
elif nv.ndim > 2: # nv has more than 2D - raise an error # TODO 0.9? Support 3D arrays in DataFile?
88+
elif nv.ndim > 2:
8989
raise ValueError(f"DataFile.data should be no more than 2 dimensional not shape {nv.shape}")
9090
if not isinstance(
9191
nv, DataArray

Stoner/folders/mixins.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -493,6 +493,12 @@ class PlotFolder(DataFolder):
493493

494494
_defaults = {"plots_per_page": 12, "fig_defaults": {"figsize": (8, 6)}}
495495

496+
def __init__(self, *args, **kwargs):
497+
"""Fixup attributes."""
498+
super().__init__(*args, **kwargs)
499+
self._figure = getattr(self, "_figure", [])
500+
self._fig_args = getattr(self, "_fig_args", [])
501+
496502
def figure(self, *args, **kargs):
497503
"""Pass through for :py:func:`matplotlib.pyplot.figure` but also takes a note of the arguments for later."""
498504
self._fig_args = args

Stoner/formats/data/zip.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@ def save(save_data: Data, *args: Args, **kwargs: Kwargs) -> Data:
126126
break
127127
else:
128128
raise IOError(f"Can't figure out where the zip file is in {filename}")
129-
zipfile = zf.ZipFile(
129+
zipfile = zf.ZipFile( # pylint: disable=consider-using-with
130130
path.join(*parts[: i + 1]), "w", compression, True
131-
) # pylint: disable=consider-using-with
131+
)
132132
close_me = True
133133
member = path.join("/", *parts[i + 1 :])
134134
elif isinstance(filename, zf.ZipFile): # Handle\ zipfile instance, opening if necessary

Stoner/tools/file.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,7 @@ def get_loader(filetype, silent=False):
395395
pass
396396
if not silent:
397397
raise StonerLoadError(f"Cannot locate a loader function for {filetype}") from err
398+
return None
398399

399400

400401
def get_saver(filetype, silent=False):
@@ -427,6 +428,7 @@ def get_saver(filetype, silent=False):
427428
pass
428429
if not silent:
429430
raise StonerLoadError(f"Cannot locate a loader function for {filetype}") from err
431+
return None
430432

431433

432434
def clear_routine(name, loader=True, saver=True):
@@ -490,7 +492,7 @@ def __init__(self, filename, *args, **kargs):
490492
if parsed.scheme not in URL_SCHEMES:
491493
filename = pathlib.Path(filename)
492494
else:
493-
filename = urllib.request.urlopen(filename)
495+
filename = urllib.request.urlopen(filename) # pylint: disable=consider-using-with
494496
match filename:
495497
case str() | pathlib.Path():
496498
self.mode = "open"

0 commit comments

Comments
 (0)