diff --git a/base/izzylib/path.py b/base/izzylib/path.py index 2df16db..09b3364 100644 --- a/base/izzylib/path.py +++ b/base/izzylib/path.py @@ -36,7 +36,7 @@ class Path(str): def append(self, text): - return Path(str(self.__path) + text) + return Path(self + text) def backup(self, ext='backup', overwrite=False): diff --git a/sql/izzylib/sql/generic.py b/sql/izzylib/sql/generic.py index c8dac85..dd31153 100644 --- a/sql/izzylib/sql/generic.py +++ b/sql/izzylib/sql/generic.py @@ -46,10 +46,12 @@ class SqlDatabase: engine_string = dbtype + '://' if dbtype == 'sqlite': - if nfs_check(kwargs.get('database')): + database = kwargs.get('database') + + if nfs_check(database): izzylog.error('Database file is on an NFS share which does not support locking. Any writes to the database will fail') - engine_string += '/' + str(kwargs.get('database')) + engine_string += f'/{database}' engine_kwargs['connect_args'] = {'check_same_thread': False} else: diff --git a/sql/izzylib/sql/sqlite_server.py b/sql/izzylib/sql/sqlite_server.py index 5088aec..9cd5b6d 100644 --- a/sql/izzylib/sql/sqlite_server.py +++ b/sql/izzylib/sql/sqlite_server.py @@ -176,7 +176,7 @@ class SqliteServer(misc.DotDict): self.setup_metadata() for path in self.path.listdir(False): - if path.str().endswith('.sqlite3') and path.stem != 'metadata': + if path.endswith('.sqlite3') and path.stem != 'metadata': self.open(path.stem)