Skip to content

Commit

Permalink
remove clutter
Browse files Browse the repository at this point in the history
  • Loading branch information
jgriesfeller committed Oct 30, 2024
1 parent 7894167 commit 6b6357a
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 13 deletions.
2 changes: 0 additions & 2 deletions src/pyaro/timeseries/Engine.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import abc
from contextlib import contextmanager


class Engine(abc.ABC):
Expand All @@ -16,7 +15,6 @@ def open(self, filename_or_obj_or_url, *, filters=None):
pass

@abc.abstractmethod
# @contextmanager
def read(self):
"""read-method of the timeseries
Expand Down
5 changes: 1 addition & 4 deletions src/pyaro/timeseries/Reader.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import abc
from contextlib import contextmanager

from .Data import Data
from .Station import Station
from .Filter import Filter, filters


class Reader(abc.ABC):
Expand All @@ -22,7 +20,6 @@ def __init__(self, filename_or_obj_or_url, filters=None, **kwargs):
pass

@abc.abstractmethod
# @contextmanager
def read(self):
"""define read method. All needed parameters should be put into self
by the __init__ method
Expand Down Expand Up @@ -94,4 +91,4 @@ def __exit__(self, type, value, traceback):
The default implementation calls the close function.
"""
self.close()
return
return
9 changes: 2 additions & 7 deletions src/pyaro/timeseries/Wrappers.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
from .Reader import Reader
from .Data import Data
from contextlib import contextmanager


class VariableNameChangingReader(Reader):
Expand All @@ -15,7 +13,7 @@ class VariableNameChangingReader(Reader):
"""

def __init__(self, reader: Reader, reader_to_new: dict[str, str], **kwargs,):
def __init__(self, reader: Reader, reader_to_new: dict[str, str], **kwargs, ):
"""Initialize the variable name changes of Reader
:param reader: The Reader instance to change variable names on
Expand Down Expand Up @@ -68,13 +66,10 @@ def variables(self):
def close(self):
self._reader.close()

# @contextmanager
def read(self,):
def read(self, ):
"""define read method. All needed parameters should be put into self
by the __init__ method
This method is called after the Engine's open function.
"""
return self._reader.read()


0 comments on commit 6b6357a

Please sign in to comment.