solentware-base 5.4__tar.gz → 5.5.2__tar.gz

{solentware_base-5.4/solentware_base.egg-info → solentware_base-5.5.2}/PKG-INFO

@@ -1,16 +1,16 @@
 Metadata-Version: 2.4
 Name: solentware-base
-Version: 5.4
+Version: 5.5.2
 Summary: Bitmapped record number databases.
 Author-email: Roger Marsh <roger.marsh@solentware.co.uk>
 License-Expression: BSD-3-Clause
 Project-URL: Homepage, http://www.solentware.co.uk
 Project-URL: Repository, https://github.com/RogerMarsh/solentware-base.git
 Project-URL: Bug Tracker, https://github.com/RogerMarsh/solentware-base/issues
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Database
 Classifier: Intended Audience :: Developers

{solentware_base-5.4 → solentware_base-5.5.2}/pyproject.toml

@@ -10,16 +10,16 @@ line-length = 79
 
 [project]
 name = "solentware-base"
-version = "5.4"
+version = "5.5.2"
 authors = [
   { name="Roger Marsh", email="roger.marsh@solentware.co.uk" },
 ]
 description = "Bitmapped record number databases."
 classifiers = [
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Operating System :: OS Independent",
     "Topic :: Database",
     "Intended Audience :: Developers",

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/__init__.py

@@ -4,7 +4,7 @@
 
 """Provide an identical interface to several Python database modules.
 
-The supported modules, or packages, are apsw, bsbdb3, dbm, dptdb, ndbm,
+The supported modules, or packages, are apsw, bsbdb3, dbm, dpt_dbms, ndbm,
 sqlite3, unqlite, and vedis.
 
 """

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/apsw_database.py

@@ -10,6 +10,7 @@ Prefer to use the apswdu_database module when adding lots of new
 records.  It will be a lot quicker because it defers index updates.
 
 """
+
 import apsw
 
 from .core import _sqlite

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/apswdu_database.py

@@ -9,6 +9,7 @@ The apsw_database module provides the database interface.
 Prefer to use the apsw_database module normally.
 
 """
+
 from . import apsw_database
 from .core import _sqlitedu
 from .core import _sqlite

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/berkeleydbdu_database.py

@@ -9,6 +9,7 @@ The berkeleydb_database module provides the database interface.
 Prefer to use the berkeleydb_database module normally.
 
 """
+
 from . import berkeleydb_database
 from .core import _dbdu
 from .core import _db

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/bsddb3du_database.py

@@ -9,6 +9,7 @@ The bsddb3_database module provides the database interface.
 Prefer to use the bsddb3_database module normally.
 
 """
+
 from . import bsddb3_database
 from .core import _dbdu
 from .core import _db

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/__init__.py

@@ -16,6 +16,6 @@ The dbm module for dbm.gnu databases is supported.
 
 The ndbm module for ndbm.gnu databases is supported.
 
-The dptdb module for DPT databases is supported.
+The dpt_dbms module for DPT databases is supported.
 
 """

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/_database.py

@@ -9,6 +9,7 @@ methods.  The _dpt module's versions of these methods are too different to
 justify making _dpt.Database a subclass of _database.Database.
 
 """
+
 from .segmentsize import SegmentSize
 from .find import Find
 from .where import Where

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/_databasedu.py

@@ -9,6 +9,7 @@ deferred updates is so different there is no equivalent separate module for
 DPT.
 
 """
+
 from . import _database
 from .segmentsize import SegmentSize
 from .constants import SECONDARY
@@ -249,17 +250,24 @@ class Database(_database.Database):
         writer = self.merge_writer(file, field)
         merger = merge.Merge(index_directory)
         commit_count = None
-        for commit_count, item in enumerate(merger.sorter()):
-            if not commit_count % commit_limit:
-                if commit_count:
-                    writer.close_cursor()
-                    self.commit()
-                    self.deferred_update_housekeeping()
-                    yield commit_count
-                    self.start_transaction()
-                    writer.make_new_cursor()
-            writer.write(item)
-        writer.close_cursor()
+        try:
+            for commit_count, item in enumerate(merger.sorter()):
+                if not commit_count % commit_limit:
+                    if commit_count:
+                        writer.close_cursor()
+                        self.commit()
+                        self.deferred_update_housekeeping()
+                        yield commit_count
+                        self.start_transaction()
+                        writer.make_new_cursor()
+                writer.write(item)
+            writer.close_cursor()
+        finally:
+            # An exception may leave some reader files open.
+            # A 'ResourceWarning: unclosed file <io.TextIOWrapper ...>'
+            # message in *_merge_import tests revealed this.
+            for reader in merger.readers.values():
+                reader.file.close()
         if commit_count is not None:
             self.commit()
             self.deferred_update_housekeeping()

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/_db.py

@@ -18,6 +18,7 @@ Berkeley DB 4.6 is not compatible with berkeleydb, but can be accessed by
 the _db_tkinter module, a sibling of _db (this module).
 
 """
+
 import os
 from ast import literal_eval
 import bisect
@@ -310,8 +311,10 @@ class Database(_database.Database):
             self.dbenv.log_set_config(dbe.DB_LOG_AUTO_REMOVE, 1)
         except AttributeError as exc:
             if not _openbsd_platform:
+                self.dbenv.close()
                 raise
             if "'log_set_config'" not in str(exc):
+                self.dbenv.close()
                 raise
         if gbytes or bytes_:
             self.dbenv.set_cachesize(gbytes, bytes_)
@@ -399,6 +402,7 @@ class Database(_database.Database):
             )
         except:
             self.table[CONTROL_FILE] = None
+            self.dbenv.close()
             raise
         for file, specification in self.specification.items():
             if file not in files:
@@ -415,6 +419,7 @@ class Database(_database.Database):
                 )
             except:
                 self.table[file] = None
+                self.dbenv.close()
                 raise
             self.ebm_control[file] = ExistenceBitmapControl(
                 file, self, dbe, db_create
@@ -431,6 +436,7 @@ class Database(_database.Database):
                 )
             except:
                 self.segment_table[file] = None
+                self.dbenv.close()
                 raise
             fieldprops = specification[FIELDS]
             for field, fieldname in fields.items():
@@ -463,8 +469,10 @@ class Database(_database.Database):
                             ": unexpected file type or format')",
                         )
                     ):
+                        self.dbenv.close()
                         raise
                     if access_method is not dbe.DB_HASH:
+                        self.dbenv.close()
                         raise
 
                     # Accept existing DB_BTREE database if DB_HASH was in the
@@ -481,10 +489,12 @@ class Database(_database.Database):
                         )
                     except:
                         self.table[secondary] = None
+                        self.dbenv.close()
                         raise
 
                 except:
                     self.table[secondary] = None
+                    self.dbenv.close()
                     raise
         if db_create:  # and files:
             self.table[CONTROL_FILE].put(
@@ -1038,7 +1048,10 @@ class Database(_database.Database):
                 recnums = self._get_segment_record_numbers(file, segment_key)
                 if isinstance(recnums, list):
                     discard = bisect.bisect_left(recnums, record_number)
-                    if recnums[discard] == record_number:
+                    if (
+                        discard < len(recnums)
+                        and recnums[discard] == record_number
+                    ):
                         del recnums[discard]
                     count = len(recnums)
                     if count < 2:

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/_db_tkinter.py

@@ -15,6 +15,7 @@ In particular on OpenBSD 7.3 where the default Python is 3.10 and 4.6.21
 is the version of Berkeley DB.
 
 """
+
 import os
 from ast import literal_eval
 import bisect
@@ -332,16 +333,20 @@ class Database(_database.Database):
                         1
                     ].decode()
                 )
-                if self._use_specification_items is not None:
-                    self.specification.is_consistent_with(
-                        {
-                            k: v
-                            for k, v in spec_from_db.items()
-                            if k in self._use_specification_items
-                        }
-                    )
-                else:
-                    self.specification.is_consistent_with(spec_from_db)
+                try:
+                    if self._use_specification_items is not None:
+                        self.specification.is_consistent_with(
+                            {
+                                k: v
+                                for k, v in spec_from_db.items()
+                                if k in self._use_specification_items
+                            }
+                        )
+                    else:
+                        self.specification.is_consistent_with(spec_from_db)
+                except:
+                    tcl_tk_call((self.dbenv, "close"))
+                    raise
                 segment_size = literal_eval(
                     tcl_tk_call((control, "get", SEGMENT_SIZE_BYTES_KEY))[0][
                         1
@@ -352,6 +357,7 @@ class Database(_database.Database):
                     self._real_segment_size_bytes = False
                 if segment_size != self.segment_size_bytes:
                     self._real_segment_size_bytes = segment_size
+                    tcl_tk_call((self.dbenv, "close"))
                     raise self.SegmentSizeError(
                         "".join(
                             (
@@ -368,6 +374,7 @@ class Database(_database.Database):
             # Assume equivalent to not a DBNoSuchFileError exception if path
             # exists.
             if fnfd and os.path.exists(fnfd):
+                tcl_tk_call((self.dbenv, "close"))
                 raise
             db_create = True
             options = ["-create"]
@@ -492,6 +499,7 @@ class Database(_database.Database):
             self.table[CONTROL_FILE] = tcl_tk_call(tuple(command))
         except TclError:
             self.table[CONTROL_FILE] = None
+            tcl_tk_call((self.dbenv, "close"))
             raise
         for file, specification in self.specification.items():
             if file not in files:
@@ -520,6 +528,7 @@ class Database(_database.Database):
                 self.table[file] = tcl_tk_call(tuple(command))
             except TclError:
                 self.table[file] = None
+                tcl_tk_call((self.dbenv, "close"))
                 raise
             self.ebm_control[file] = ExistenceBitmapControl(
                 file, self, dbe, db_create
@@ -547,6 +556,7 @@ class Database(_database.Database):
                 self.segment_table[file] = tcl_tk_call(tuple(command))
             except TclError:
                 self.segment_table[file] = None
+                tcl_tk_call((self.dbenv, "close"))
                 raise
             fieldprops = specification[FIELDS]
             for field, fieldname in fields.items():
@@ -593,8 +603,10 @@ class Database(_database.Database):
                             )
                         )
                     ):
+                        tcl_tk_call((self.dbenv, "close"))
                         raise
                     if access_method != "-hash":
+                        tcl_tk_call((self.dbenv, "close"))
                         raise
 
                     # Accept existing DB_BTREE database if DB_HASH was in the
@@ -616,10 +628,12 @@ class Database(_database.Database):
                         self.table[secondary] = tcl_tk_call(tuple(command))
                     except:
                         self.table[secondary] = None
+                        tcl_tk_call((self.dbenv, "close"))
                         raise
 
                 except:
                     self.table[secondary] = None
+                    tcl_tk_call((self.dbenv, "close"))
                     raise
         if db_create:  # and files:
             command = [self.table[CONTROL_FILE], "put"]
@@ -1323,7 +1337,10 @@ class Database(_database.Database):
                 recnums = self._get_segment_record_numbers(file, segment_key)
                 if isinstance(recnums, list):
                     discard = bisect.bisect_left(recnums, record_number)
-                    if recnums[discard] == record_number:
+                    if (
+                        discard < len(recnums)
+                        and recnums[discard] == record_number
+                    ):
                         del recnums[discard]
                     count = len(recnums)
                     if count < 2:

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/_dbdu.py

@@ -3,6 +3,7 @@
 # Licence: See LICENCE (BSD licence)
 
 """Access a Berkeley DB database with the berkeleydb or bsddb3 modules."""
+
 from .constants import (
     SECONDARY,
     # ACCESS_METHOD,

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/_dbdu_tkinter.py

@@ -3,6 +3,7 @@
 # Licence: See LICENCE (BSD licence)
 
 """Access a Berkeley DB database with tcl via the tkinter module."""
+
 from ..db_tcl import tcl_tk_call
 from .constants import (
     SECONDARY,

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/_dpt.py

@@ -2,17 +2,18 @@
 # Copyright 2019 Roger Marsh
 # Licence: See LICENCE (BSD licence)
 
-"""Access a DPT database with the dptdb module.
+"""Access a DPT database with the dpt_dbms module.
 
 The database will have been created from the application's customization
 of the filespec.FileSpec class.
 
 """
+
 import os
 from ast import literal_eval
 import re
 
-from dptdb import dptapi
+from dpt_dbms import dptapi
 
 from . import _database
 from . import filespec
@@ -420,7 +421,7 @@ class Database(_database.Database):
         return self.table[file].get_primary_record(key)
 
     def encode_record_number(self, key):
-        """Return repr(key) because this is dptdb version.
+        """Return repr(key) because this is dpt_dbms version.
 
         Typically used to convert primary key, a record number, to secondary
         index format.
@@ -429,7 +430,7 @@ class Database(_database.Database):
         return repr(key)
 
     def decode_record_number(self, skey):
-        """Return literal_eval(skey) because this is dptdb version.
+        """Return literal_eval(skey) because this is dpt_dbms version.
 
         Typically used to convert secondary index reference to primary record,
         a str(int), to a record number.
@@ -438,7 +439,7 @@ class Database(_database.Database):
         return literal_eval(skey)
 
     def encode_record_selector(self, key):
-        """Return key because this is dptdb version.
+        """Return key because this is dpt_dbms version.
 
         Typically used to convert a key being used to search a secondary index
         to the form held on the database.
@@ -818,7 +819,7 @@ class Database(_database.Database):
                         yield value
                     dvcursor.Advance()
             else:
-                dvcursor.GotoLast()
+                dvcursor.GotoFirst()
                 while dvcursor.Accessible():
                     value = dvcursor.GetCurrentValue().ExtractString()
                     if valuespec.apply_pattern_and_set_filters_to_value(value):

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/_lmdb.py

@@ -3,6 +3,7 @@
 # Licence: See LICENCE (BSD licence)
 
 """Access a Symas Lightning Memory-Mapped Database (LMMD) database."""
+
 import os
 from ast import literal_eval
 import bisect
@@ -275,6 +276,7 @@ class Database(_database.Database):
             )
         except:
             self.table[DESIGN_FILE] = None
+            dbenv.close()
             raise
         try:
             self.table[CONTROL_FILE] = _Datastore(
@@ -284,6 +286,7 @@ class Database(_database.Database):
             )
         except:
             self.table[CONTROL_FILE] = None
+            dbenv.close()
             raise
         if files is None:
             files = self.specification.keys()
@@ -309,6 +312,7 @@ class Database(_database.Database):
                 )
             except:
                 self.segment_table[file] = None
+                dbenv.close()
                 raise
             for field, fieldname in fields.items():
                 if fieldname is None:
@@ -373,16 +377,20 @@ class Database(_database.Database):
         self.end_read_only_transaction()
         self.table[DESIGN_FILE].close_datastore()
         spec_from_db = literal_eval(spec_from_db.decode())
-        if self._use_specification_items is not None:
-            self.specification.is_consistent_with(
-                {
-                    k: v
-                    for k, v in spec_from_db.items()
-                    if k in self._use_specification_items
-                }
-            )
-        else:
-            self.specification.is_consistent_with(spec_from_db)
+        try:
+            if self._use_specification_items is not None:
+                self.specification.is_consistent_with(
+                    {
+                        k: v
+                        for k, v in spec_from_db.items()
+                        if k in self._use_specification_items
+                    }
+                )
+            else:
+                self.specification.is_consistent_with(spec_from_db)
+        except:
+            self.dbenv.close()
+            raise
         segment_size = literal_eval(segment_size.decode())
         if self._real_segment_size_bytes is not False:
             self.segment_size_bytes = self._real_segment_size_bytes
@@ -1108,7 +1116,10 @@ class Database(_database.Database):
                 recnums = self._get_segment_record_numbers(file, segment_key)
                 if isinstance(recnums, list):
                     discard = bisect.bisect_left(recnums, record_number)
-                    if recnums[discard] == record_number:
+                    if (
+                        discard < len(recnums)
+                        and recnums[discard] == record_number
+                    ):
                         del recnums[discard]
                     count = len(recnums)
                     if count < 2:

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/_lmdbdu.py

@@ -3,6 +3,7 @@
 # Licence: See LICENCE (BSD licence)
 
 """Deferred update access to Symas Lightning Memory-Mapped Database (LMMD)."""
+
 from .constants import (
     SECONDARY,
     SUBFILE_DELIMITER,

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/_nosql.py

@@ -9,6 +9,7 @@ interfaces are sufficiently similar that one module and set of classes
 can cope with all of them.
 
 """
+
 import os
 from ast import literal_eval
 import re

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/_nosqldu.py

@@ -10,6 +10,7 @@ The dbm and ndbm modules are provided with Python; the unqlite and vedis
 modules can be found in PyPI.
 
 """
+
 from ast import literal_eval
 from bisect import bisect_right
 

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/_sqlite.py

@@ -7,6 +7,7 @@
 When using sqlite3 the Python version must be 3.6 or later.
 
 """
+
 import os
 from ast import literal_eval
 import re
@@ -172,45 +173,64 @@ class Database(_database.Database):
         if self.database_file is not None:
             dbenv = dbe.Connection(self.database_file)
             cursor = dbenv.cursor()
-            statement = " ".join(
-                (
-                    "select",
-                    SQLITE_VALUE_COLUMN,
-                    "from",
-                    CONTROL_FILE,
-                    "where",
-                    CONTROL_FILE,
-                    "== ?",
-                )
+            cursor.execute(
+                " ".join(
+                    (
+                        "select name from sqlite_master",
+                        "where type == 'table' and name == ?",
+                    )
+                ),
+                (CONTROL_FILE,),
             )
-            try:
+            if cursor.fetchall():
+                statement = " ".join(
+                    (
+                        "select",
+                        SQLITE_VALUE_COLUMN,
+                        "from",
+                        CONTROL_FILE,
+                        "where",
+                        CONTROL_FILE,
+                        "== ?",
+                    )
+                )
                 cursor.execute(statement, (SPECIFICATION_KEY,))
                 rsk = cursor.fetchall()
-            except Exception:
-                pass
-            try:
                 cursor.execute(statement, (SEGMENT_SIZE_BYTES_KEY,))
                 rssbk = cursor.fetchall()
-            except Exception:
-                pass
             if rsk is not None and rssbk is not None:
                 spec_from_db = literal_eval(rsk[0][0])
-                if self._use_specification_items is not None:
-                    self.specification.is_consistent_with(
-                        {
-                            k: v
-                            for k, v in spec_from_db.items()
-                            if k in self._use_specification_items
-                        }
-                    )
-                else:
-                    self.specification.is_consistent_with(spec_from_db)
+
+                # This 'try ... except ...' prevents 7 of the 16 ERROR reports
+                # produced, ignoring tests in test___do_database_tasks, on
+                # Microsoft Windows when run by
+                # 'py -3.13 -m unittest -k test_deferred_update'.
+                # The expected exception is FileSpecError but catch all to stay
+                # as close as possible to original code.
+                try:
+                    if self._use_specification_items is not None:
+                        self.specification.is_consistent_with(
+                            {
+                                k: v
+                                for k, v in spec_from_db.items()
+                                if k in self._use_specification_items
+                            }
+                        )
+                    else:
+                        self.specification.is_consistent_with(spec_from_db)
+                except:
+                    cursor.close()
+                    dbenv.close()
+                    raise
+
                 segment_size = literal_eval(rssbk[0][0])
                 if self._real_segment_size_bytes is not False:
                     self.segment_size_bytes = self._real_segment_size_bytes
                     self._real_segment_size_bytes = False
                 if segment_size != self.segment_size_bytes:
                     self._real_segment_size_bytes = segment_size
+                    cursor.close()
+                    dbenv.close()
                     raise self.SegmentSizeError(
                         "".join(
                             (
@@ -220,8 +240,12 @@ class Database(_database.Database):
                         )
                     )
             elif rsk is None and rssbk is not None:
+                cursor.close()
+                dbenv.close()
                 raise DatabaseError("No specification recorded in database")
             elif rsk is not None and rssbk is None:
+                cursor.close()
+                dbenv.close()
                 raise DatabaseError("No segment size recorded in database")
         else:
             dbenv = dbe.Connection(":memory:")
@@ -1942,18 +1966,7 @@ class Database(_database.Database):
                 "glob ?",
             )
         )
-        values = (
-            b"".join(
-                (
-                    (
-                        keystart.encode()
-                        if isinstance(keystart, str)
-                        else keystart
-                    ),
-                    b"*",
-                )
-            ),
-        )
+        values = (keystart + "*",)
         db_segment_size_bytes = SegmentSize.db_segment_size_bytes
         get_segment_records = self.get_segment_records
         cursor = self.dbenv.cursor()

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/_sqlitedu.py

@@ -7,6 +7,7 @@
 When using sqlite3 the Python version must be 3.6 or later.
 
 """
+
 from .constants import (
     SECONDARY,
     SQLITE_SEGMENT_COLUMN,

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/bytebit.py

@@ -14,6 +14,7 @@ Bitarray mostly takes about 4 times longer to do something than bitarray, but
 takes about 100 times longer to count set bits.
 
 """
+
 # The decision is made here, rather than in solentware_base.__init__, because
 # the DPT specific modules in solentware_base do not need a bit array class as
 # DPT provides it's own bit array handling.

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/constants.py

@@ -10,10 +10,11 @@ See www.dptoolkit.com for details of DPT (No longer exists.  The database
 interface part of DPT is available at www.solentware.co.uk)
 
 """
+
 # Module names of supported database engines (<module>.__name__).
 BERKELEYDB_MODULE = "berkeleydb"
 BSDDB3_MODULE = "bsddb3"
-DPT_MODULE = "dptdb.dptapi"
+DPT_MODULE = "dpt_dbms.dptapi"
 SQLITE3_MODULE = "sqlite3"
 APSW_MODULE = "apsw"
 UNQLITE_MODULE = "unqlite"

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/cursor.py

@@ -31,9 +31,9 @@ class Cursor:
 
     For apsw and sqlite3 (SQLite) dbset will be a Connection() object.
 
-    For dptdb (DPT) dbset will be a core._dpt.DPTFile() object which creates
-    a RecordSetCursor() or DirectValueCursor(), for records and indicies, on
-    an OpenContext() object.
+    For dpt_dbms (DPT) dbset will be a core._dpt.DPTFile() object which
+    creates a RecordSetCursor() or DirectValueCursor(), for records and
+    indicies, on an OpenContext() object.
 
     (A version of the DPT interface is planned where dbset will be an
     OpenContext() object.)

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/filespec.py

@@ -7,6 +7,7 @@
 Example database specifications are in the samples directory.
 
 """
+
 import os
 
 from .constants import (

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/recordsetcursor.py

@@ -8,6 +8,7 @@ Method names are taken from Berkeley DB to indicate preference for that
 style of cursor.
 
 """
+
 from . import cursor
 
 

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/segmentsize.py

@@ -28,6 +28,7 @@ Normalization converts a list with more than 'upper' records to a bitmap.
 Normalization converts a bitmap with less than 'lower' records to a list.
 
 """
+
 from . import bytebit
 
 

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/core/tree.py

@@ -8,6 +8,7 @@ This module provides ordered access to indicies stored in databases such as
 UnQLite and Vedis.
 
 """
+
 from bisect import bisect_right, bisect_left
 from ast import literal_eval
 

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/db_tkinterdu_database.py

@@ -9,6 +9,7 @@ The db_tkinter_database module provides the database interface.
 Prefer to use the tkinter_database module normally.
 
 """
+
 from . import db_tkinter_database
 from .core import _dbdu_tkinter
 from .core import _db_tkinter

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/dpt_database.py

@@ -9,6 +9,7 @@ updates, which will be a lot quicker when adding lots of new
 records.
 
 """
+
 from .core import _dpt
 
 

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/dptdu_database.py

@@ -9,9 +9,10 @@ external backups should be used.  Use dpt_database for transactions,
 but adding lots of new records will be a lot slower.
 
 """
+
 import os
 
-from dptdb import dptapi
+from dpt_dbms import dptapi
 
 from .core import _dpt
 from .core.constants import (

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/dptfastload_database.py

@@ -8,6 +8,7 @@ The DPT fastload interface is used to do updates.  The compressed file
 format defined in Appendix 2 of the DBA Guide is used.
 
 """
+
 import os
 
 from .core import _dpt

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/gnu_database.py

@@ -10,6 +10,7 @@ Prefer to use the gnudu_database module when adding lots of new
 records.  It will be a lot quicker because it defers index updates.
 
 """
+
 from . import gnu_module
 from .core import _nosql
 

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/gnu_module.py

@@ -3,6 +3,7 @@
 # Licence: See LICENCE (BSD licence)
 
 """Provide Gnu class to fit dbm.gnu API to UnQLite and Vedis API."""
+
 import dbm.gnu
 
 

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/gnudu_database.py

@@ -9,6 +9,7 @@ The gnu_database module provides the database interface.
 Prefer to use the gnu_database module normally.
 
 """
+
 from . import gnu_database
 from .core import _nosqldu
 from .core import _nosql

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/lmdbdu_database.py

@@ -7,6 +7,7 @@
 The lmdb_database module provides the database interface.
 
 """
+
 from . import lmdb_database
 from .core import _lmdbdu
 from .core import _lmdb

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/modulequery.py

@@ -49,6 +49,7 @@ Berkeley DB (db) is made available via tkinter if the tcl interface to db
 is configured in the installed db.
 
 """
+
 import sys
 import os
 
@@ -123,7 +124,7 @@ try:
 except ImportError:  # Not ModuleNotFoundError for Pythons earlier than 3.6
     lmdb = None
 try:
-    from dptdb import dptapi
+    from dpt_dbms import dptapi
 except ImportError:  # Not ModuleNotFoundError for Pythons earlier than 3.6
     dptapi = None
 if _allow("allow_ndbm") or _allow("-n"):

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/ndbm_module.py

@@ -3,6 +3,7 @@
 # Licence: See LICENCE (BSD licence)
 
 """Provide Ndbm class to fit dbm.ndbm API to UnQLite and Vedis API."""
+
 import dbm.ndbm
 
 

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/ndbmdu_database.py

@@ -9,6 +9,7 @@ The ndbm_database module provides the database interface.
 Prefer to use the ndbm_database module normally.
 
 """
+
 from . import ndbm_database
 from .core import _nosqldu
 from .core import _nosql

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/sqlite3_database.py

@@ -13,6 +13,7 @@ The Python version must be 3.6 or later.  Use apsw_database on earlier
 versions of Python.
 
 """
+
 import sqlite3
 
 from .core import _sqlite

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/sqlite3du_database.py

@@ -9,6 +9,7 @@ The sqlite3_database module provides the database interface.
 Prefer to use the sqlite3_database module normally.
 
 """
+
 from . import sqlite3_database
 from .core import _sqlitedu
 from .core import _sqlite

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/tools/base_3_to_4.py

@@ -3,6 +3,7 @@
 # Licence: See LICENCE (BSD licence)
 
 """Upgrade a solentware_base version 3 database to version 4."""
+
 import os
 
 from ..core.filespec import FileSpec

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/tools/base_3_to_4_db.py

@@ -8,6 +8,7 @@ The Berkeley DB databases are moved from their 'one database per file'
 organization to an 'all databases on one file' organization.
 
 """
+
 import os
 
 from ..core.segmentsize import SegmentSize

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/tools/base_3_to_4_sqlite.py

@@ -3,6 +3,7 @@
 # Licence: See LICENCE (BSD licence)
 
 """Upgrade a solentware_base version 3 database on SQLite 3 to version 4."""
+
 import os
 
 from ..core.segmentsize import SegmentSize

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/tools/berkeleydb_du_splice_fix.py

@@ -3,6 +3,7 @@
 # Licence: See LICENSE.txt (BSD licence)
 
 """Delete index references kept, not replaced, in deferred update runs."""
+
 import os
 import sys
 

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/tools/create_database.py

@@ -61,7 +61,7 @@ try:
 except ImportError:  # Not ModuleNotFoundError for Pythons earlier than 3.6
     db_tcl = None
 try:
-    from dptdb import dptapi
+    from dpt_dbms import dptapi
 except ImportError:  # Not ModuleNotFoundError for Pythons earlier than 3.6
     dptapi = None
 try:

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/unqlite_database.py

@@ -10,6 +10,7 @@ Prefer to use the unqlitedu_database module when adding lots of new
 records.  It will be a lot quicker because it defers index updates.
 
 """
+
 import unqlite
 
 from .core import _nosql

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/unqlitedu_database.py

@@ -9,6 +9,7 @@ The unqlite_database module provides the database interface.
 Prefer to use the unqlite_database module normally.
 
 """
+
 from . import unqlite_database
 from .core import _nosqldu
 from .core import _nosql

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/vedis_database.py

@@ -10,6 +10,7 @@ Prefer to use the vedisdu_database module when adding lots of new
 records.  It will be a lot quicker because it defers index updates.
 
 """
+
 import vedis
 
 from .core import _nosql

{solentware_base-5.4 → solentware_base-5.5.2}/solentware_base/vedisdu_database.py

@@ -9,6 +9,7 @@ The vedis_database module provides the database interface.
 Prefer to use the vedis_database module normally.
 
 """
+
 from . import vedis_database
 from .core import _nosqldu
 from .core import _nosql

{solentware_base-5.4 → solentware_base-5.5.2/solentware_base.egg-info}/PKG-INFO

@@ -1,16 +1,16 @@
 Metadata-Version: 2.4
 Name: solentware-base
-Version: 5.4
+Version: 5.5.2
 Summary: Bitmapped record number databases.
 Author-email: Roger Marsh <roger.marsh@solentware.co.uk>
 License-Expression: BSD-3-Clause
 Project-URL: Homepage, http://www.solentware.co.uk
 Project-URL: Repository, https://github.com/RogerMarsh/solentware-base.git
 Project-URL: Bug Tracker, https://github.com/RogerMarsh/solentware-base/issues
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Database
 Classifier: Intended Audience :: Developers