diff --git a/class/core/db.py b/class/core/db.py index 5be95e8b9..a5052d305 100755 --- a/class/core/db.py +++ b/class/core/db.py @@ -3,6 +3,7 @@ import sqlite3 import os +import sys class Sql(): @@ -31,6 +32,14 @@ class Sql(): except Exception as ex: return "error: " + str(ex) + def autoTextFactory(): + if sys.version_info[0] == 3: + self.__DB_CONN.text_factory = lambda x: str( + x, encoding="utf-8", errors='ignore') + else: + self.__DB_CONN.text_factory = lambda x: unicode( + x, "utf-8", "ignore") + def dbfile(self, name): self.__DB_FILE = 'data/' + name + '.db' return self diff --git a/plugins/webstats/tool_migrate.py b/plugins/webstats/tool_migrate.py index d190cae58..88aede22b 100644 --- a/plugins/webstats/tool_migrate.py +++ b/plugins/webstats/tool_migrate.py @@ -66,11 +66,7 @@ def pSqliteDb(dbname='web_logs', site_name='unset', fn="logs"): conn.execute("PRAGMA page_size = 4096", ()) conn.execute("PRAGMA journal_mode = wal", ()) - if sys.version_info[0] == 3: - conn.__DB_CONN.text_factory = lambda x: str( - x, encoding="utf-8", errors='ignore') - else: - conn.__DB_CONN.text_factory = lambda x: unicode(x, "utf-8", "ignore") + conn.autoTextFactory() # conn.text_factory = lambda x: str(x, encoding="utf-8", errors='ignore') # conn.text_factory = lambda x: unicode(x, "utf-8", "ignore")