From 6636ee271bbbedb3c3057fe72089d190b5fca3e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Golonka?= Date: Mon, 17 Jan 2022 13:58:15 +0100 Subject: [PATCH 1/2] Remove deprecated loadState and saveState from addonHandler --- source/addonHandler/__init__.py | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/source/addonHandler/__init__.py b/source/addonHandler/__init__.py index 374c74f44da..c61a32cee79 100644 --- a/source/addonHandler/__init__.py +++ b/source/addonHandler/__init__.py @@ -1,5 +1,5 @@ # A part of NonVisual Desktop Access (NVDA) -# Copyright (C) 2012-2021 Rui Batista, NV Access Limited, Noelia Ruiz Martínez, +# Copyright (C) 2012-2022 Rui Batista, NV Access Limited, Noelia Ruiz Martínez, # Joseph Lee, Babbage B.V., Arnold Loubriat, Łukasz Golonka # This file is covered by the GNU General Public License. # See the file COPYING for more details. @@ -30,7 +30,6 @@ from . import addonVersionCheck from .addonVersionCheck import isAddonCompatible import extensionPoints -import buildVersion MANIFEST_FILENAME = "manifest.ini" @@ -121,15 +120,6 @@ def cleanupRemovedDisabledAddons(self) -> None: state = AddonsState() -# Deprecated - use `state.save` and `state.load` instead. -if buildVersion.version_year < 2022: - def saveState(): - state.save() - - def loadState(): - state.load() - - def getRunningAddons(): """ Returns currently loaded add-ons. """ From 60d4af8e4909b156a5aab2e576659cb853c41149 Mon Sep 17 00:00:00 2001 From: buddsean Date: Tue, 18 Jan 2022 11:47:40 +1100 Subject: [PATCH 2/2] update changes --- user_docs/en/changes.t2t | 1 + 1 file changed, 1 insertion(+) diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t index e8edb748cbd..77a3d39ac9a 100644 --- a/user_docs/en/changes.t2t +++ b/user_docs/en/changes.t2t @@ -96,6 +96,7 @@ This ensures code will honor the Windows user setting for swapping the primary m - SCons now builds with multiple concurrent jobs, equal to the number of logical processors in the system. This can dramatically decrease build times on multi core systems. (#13226) - ``characterProcessing.SYMLVL_*`` constants are removed - please use ``characterProcessing.SymbolLevel.*`` instead. (#13248) +- Functions ``loadState`` and ``saveState`` are removed from addonHandler - please use ``addonHandler.state.load`` and ``addonHandler.state.save`` instead. (#13245) -