From 798224f535058e2aa43dddd67753023d6edf2f59 Mon Sep 17 00:00:00 2001 From: Niklas Korz Date: Wed, 18 May 2022 09:53:25 +0200 Subject: [PATCH] Remove redundant class `SheetBlock` from Python Excel DSL --- apps/jupyter/puredit/dsl.py | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/apps/jupyter/puredit/dsl.py b/apps/jupyter/puredit/dsl.py index 8610664..45f8bf2 100644 --- a/apps/jupyter/puredit/dsl.py +++ b/apps/jupyter/puredit/dsl.py @@ -1,5 +1,6 @@ from typing import Callable, Iterable, Sequence, TypeVar from enum import Enum +from contextlib import AbstractContextManager from openpyxl.workbook import Workbook from openpyxl.worksheet.worksheet import Worksheet from openpyxl.cell import Cell @@ -27,7 +28,7 @@ def merge_dictionaries(*args: dict) -> dict: return result -class Sheet(object): +class Sheet(AbstractContextManager): def __init__(self, inner: Worksheet): self.inner = inner @@ -65,21 +66,10 @@ class Sheet(object): ) -class SheetBlock(object): - def __init__(self, sheet: Worksheet): - self.sheet = sheet - - def __enter__(self): - return Sheet(self.sheet) - - def __exit__(self, *args): - pass - - -def load_sheet(file_name: str, sheet_name: str) -> SheetBlock: +def load_sheet(file_name: str, sheet_name: str) -> Sheet: workbook = openpyxl.load_workbook(file_name) sheet = workbook[sheet_name] - return SheetBlock(sheet) + return Sheet(sheet) def create_workbook(sheet_name: str, columns: Sequence[Sequence[Cell]]) -> Workbook: -- 2.51.2