commit: 255c7d5c430d445ee43ceda2f6bf716c75710f23 Author: Zac Medico <zmedico <AT> gentoo <DOT> org> AuthorDate: Tue Oct 31 02:01:49 2023 +0000 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> CommitDate: Tue Oct 31 02:06:18 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=255c7d5c
sqlite: multiprocessing spawn compat Override __getstate__ to omit unpicklable attributes, and regenerate the unpicklable attributes after unpickling. Bug: https://bugs.gentoo.org/914876 Signed-off-by: Zac Medico <zmedico <AT> gentoo.org> lib/portage/cache/sqlite.py | 15 ++++++++++++++- lib/portage/tests/dbapi/test_auxdb.py | 2 +- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/lib/portage/cache/sqlite.py b/lib/portage/cache/sqlite.py index 21ecd7ea34..722b6b98d1 100644 --- a/lib/portage/cache/sqlite.py +++ b/lib/portage/cache/sqlite.py @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 import collections @@ -53,6 +53,19 @@ class database(fs_template.FsBased): self._config = config self._db_connection_info = None + def __getstate__(self): + state = self.__dict__.copy() + # These attributes are not picklable, so they are automatically + # regenerated after unpickling. + state["_db_module"] = None + state["_db_error"] = None + state["_db_connection_info"] = None + return state + + def __setstate__(self, state): + self.__dict__.update(state) + self._import_sqlite() + def _import_sqlite(self): # sqlite3 is optional with >=python-2.5 try: diff --git a/lib/portage/tests/dbapi/test_auxdb.py b/lib/portage/tests/dbapi/test_auxdb.py index 1bbf1bde35..c11eed73e8 100644 --- a/lib/portage/tests/dbapi/test_auxdb.py +++ b/lib/portage/tests/dbapi/test_auxdb.py @@ -31,7 +31,7 @@ class AuxdbTestCase(TestCase): import sqlite3 except ImportError: self.skipTest("sqlite3 import failed") - self._test_mod("portage.cache.sqlite.database", picklable=False) + self._test_mod("portage.cache.sqlite.database", picklable=True) def _test_mod(self, auxdbmodule, multiproc=True, picklable=True): ebuilds = {
