workaround to invalid tag type

tag sometimes contains str type, which causes an error in Python3.
This commit is contained in:
Kashiko Koibumi 2024-05-31 02:32:58 +09:00
parent 6bb138e483
commit bfda9fe65e
No known key found for this signature in database
GPG Key ID: 8F06E069E37C40C4

View File

@ -1,6 +1,7 @@
"""
Sqlite Inventory
"""
import six
import sqlite3
import time
from threading import RLock
@ -110,7 +111,10 @@ class SqliteInventory(InventoryStorage):
# always use the inventoryLock OUTSIDE of the sqlLock.
with SqlBulkExecute() as sql:
for objectHash, value in self._inventory.items():
value = [value[0], value[1], sqlite3.Binary(value[2]), value[3], sqlite3.Binary(value[4])]
tag = value[4]
if six.PY3 and isinstance(tag, str):
tag = tag.encode("utf-8", "replace")
value = [value[0], value[1], sqlite3.Binary(value[2]), value[3], sqlite3.Binary(tag)]
sql.execute(
'INSERT INTO inventory VALUES (?, ?, ?, ?, ?, ?)',
sqlite3.Binary(objectHash), *value)