jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1200449?usp=email )
Change subject: cleanup: replace backports.cache with functools.cache
......................................................................
cleanup: replace backports.cache with functools.cache
Bug: T401802
Change-Id: Id7b2378bd6ce5d8c4f84aa3c6aa2469ad30c5d18
---
M pywikibot/__init__.py
M pywikibot/backports.py
M pywikibot/i18n.py
M pywikibot/version.py
4 files changed, 4 insertions(+), 11 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index a69dfb8..afca074 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -13,6 +13,7 @@
import threading
import warnings
from contextlib import suppress
+from functools import cache
from queue import Queue
from time import sleep as time_sleep
from typing import TYPE_CHECKING, Any, cast
@@ -30,7 +31,7 @@
WbTime,
WbUnknown,
)
-from pywikibot.backports import Callable, cache
+from pywikibot.backports import Callable
from pywikibot.bot import (
Bot,
CurrentPageBot,
diff --git a/pywikibot/backports.py b/pywikibot/backports.py
index c15df77..85f4b70 100644
--- a/pywikibot/backports.py
+++ b/pywikibot/backports.py
@@ -23,14 +23,6 @@
PYTHON_VERSION: tuple[int, int, int] = sys.version_info[:3]
SPHINX_RUNNING: bool = 'sphinx' in sys.modules
-# functools.cache
-if PYTHON_VERSION >= (3, 9):
- from functools import cache # type: ignore[attr-defined]
-else:
- from functools import lru_cache as _lru_cache
- cache = _lru_cache(None)
-
-
# typing
if PYTHON_VERSION < (3, 9):
from typing import DefaultDict # type: ignore[misc]
diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py
index d92f3b2..7e1a596 100644
--- a/pywikibot/i18n.py
+++ b/pywikibot/i18n.py
@@ -27,6 +27,7 @@
import re
from collections import abc, defaultdict
from contextlib import suppress
+from functools import cache
from pathlib import Path
from textwrap import fill
from typing import Any
@@ -40,7 +41,6 @@
Mapping,
Match,
Sequence,
- cache,
)
from pywikibot.plural import plural_rule
diff --git a/pywikibot/version.py b/pywikibot/version.py
index cc2dfd8..f9c4460 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -16,13 +16,13 @@
import sysconfig
import time
from contextlib import suppress
+from functools import cache
from importlib import import_module
from pathlib import Path
from warnings import warn
import pywikibot
from pywikibot import config
-from pywikibot.backports import cache
from pywikibot.comms.http import fetch
from pywikibot.exceptions import VersionParseError
from pywikibot.tools import deprecated
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1200449?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Id7b2378bd6ce5d8c4f84aa3c6aa2469ad30c5d18
Gerrit-Change-Number: 1200449
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
