From 65a513916b6516bf3f957182b76e77213a78fa0e Mon Sep 17 00:00:00 2001 From: Izalia Mae Date: Thu, 15 Jul 2021 22:49:28 -0400 Subject: [PATCH] fix import_from_path, add bytes mode to Path.read, and add clear_table to database.session --- base/izzylib/misc.py | 4 ++-- base/izzylib/path.py | 4 ++-- sql/izzylib/sql/generic.py | 4 ++++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/base/izzylib/misc.py b/base/izzylib/misc.py index af01cba..c83a9a8 100644 --- a/base/izzylib/misc.py +++ b/base/izzylib/misc.py @@ -163,8 +163,8 @@ def import_from_path(mod_path): mod_path = Path(mod_path) - if mod_path.isdir: - path = mod_path.join('__init__.py') + if mod_path.is_dir(): + path = mod_path.joinpath('__init__.py') name = path.name else: diff --git a/base/izzylib/path.py b/base/izzylib/path.py index d21cea9..36de3e8 100644 --- a/base/izzylib/path.py +++ b/base/izzylib/path.py @@ -119,9 +119,9 @@ class Path(str): return open(self, *args, **kwargs) - def read(self): + def read(self, byte=False): fd = open(self) - data = fd.read() + data = fd.read('rb' if byte else 'r') fd.close() return data diff --git a/sql/izzylib/sql/generic.py b/sql/izzylib/sql/generic.py index b794232..218c692 100644 --- a/sql/izzylib/sql/generic.py +++ b/sql/izzylib/sql/generic.py @@ -323,6 +323,10 @@ class SqlSession(object): self.execute(f'ALTER TABLE {tbl}_temp RENAME TO {tbl}') + def clear_table(self, table): + self.execute(f'DELETE FROM {table}') + + class CustomRows(object): def get(self, name): return getattr(self, name, self.Row)