jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1200450?usp=email )
Change subject: cleanup: replace Dict, List, Set from backports with bare types
......................................................................
cleanup: replace Dict, List, Set from backports with bare types
Bug: T401802
Change-Id: If52fa835c520ef5d5c50b33fe00379c2cbfae9b4
---
M pywikibot/backports.py
M pywikibot/bot.py
M pywikibot/comms/eventstreams.py
M pywikibot/data/api/_optionset.py
M pywikibot/data/api/_paraminfo.py
M pywikibot/data/sparql.py
M pywikibot/site/_siteinfo.py
7 files changed, 13 insertions(+), 23 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/backports.py b/pywikibot/backports.py
index 85f4b70..3734d80 100644
--- a/pywikibot/backports.py
+++ b/pywikibot/backports.py
@@ -41,16 +41,13 @@
from typing import (
Container,
Counter,
- Dict,
Generator,
Iterable,
Iterator,
- List,
Mapping,
Match,
Pattern,
Sequence,
- Set,
)
else:
from collections import Counter
@@ -63,10 +60,6 @@
Sequence,
)
from re import Match, Pattern
- Dict = dict # type: ignore[misc]
- List = list # type: ignore[misc]
- Set = set # type: ignore[misc]
-
if PYTHON_VERSION < (3, 9, 2):
from typing import Callable
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 882a712..99ee174 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -130,7 +130,7 @@
import pywikibot
import pywikibot.logging as pwb_logging
from pywikibot import config, daemonize, i18n, version
-from pywikibot.backports import Callable, Dict, Iterable, Sequence
+from pywikibot.backports import Callable, Iterable, Sequence
from pywikibot.bot_choice import (
AlwaysChoice,
Choice,
@@ -995,7 +995,7 @@
i18n.input('pywikibot-enter-finished-browser')
-class _OptionDict(Dict[str, Any]):
+class _OptionDict(dict[str, Any]):
"""The option dict which holds the options of OptionHandler.
diff --git a/pywikibot/comms/eventstreams.py b/pywikibot/comms/eventstreams.py
index 6db46d9..8ab71b6 100644
--- a/pywikibot/comms/eventstreams.py
+++ b/pywikibot/comms/eventstreams.py
@@ -26,7 +26,7 @@
from requests.packages.urllib3.util.response import httplib
from pywikibot import Site, Timestamp, config, debug, warning
-from pywikibot.backports import Dict, List, NoneType
+from pywikibot.backports import NoneType
from pywikibot.comms.http import user_agent
from pywikibot.tools import cached, deprecated_args
from pywikibot.tools.collections import GeneratorWrapper
@@ -179,7 +179,7 @@
if isinstance(EventSource, ModuleNotFoundError):
raise ImportError(INSTALL_MSG) from EventSource
- self.filter: Dict[str, List[Any]] = {'all': [], 'any': [], 'none': []}
+ self.filter: dict[str, list[Any]] = {'all': [], 'any': [], 'none': []}
self._total: int | None = None
self._canary = kwargs.pop('canary', False)
diff --git a/pywikibot/data/api/_optionset.py b/pywikibot/data/api/_optionset.py
index c494ed4..e401db8 100644
--- a/pywikibot/data/api/_optionset.py
+++ b/pywikibot/data/api/_optionset.py
@@ -9,7 +9,6 @@
from collections.abc import MutableMapping
import pywikibot
-from pywikibot.backports import Set
from pywikibot.tools import deprecate_arg
@@ -51,8 +50,8 @@
:meth:`from_dict`
"""
self._site_set = False
- self._enabled: Set[str] = set()
- self._disabled: Set[str] = set()
+ self._enabled: set[str] = set()
+ self._disabled: set[str] = set()
self._set_site(site, module, param)
if data:
self.from_dict(data)
diff --git a/pywikibot/data/api/_paraminfo.py b/pywikibot/data/api/_paraminfo.py
index beaf551..b7d1760 100644
--- a/pywikibot/data/api/_paraminfo.py
+++ b/pywikibot/data/api/_paraminfo.py
@@ -11,7 +11,7 @@
import pywikibot
from pywikibot import config
-from pywikibot.backports import Dict, Iterable, Set, batched
+from pywikibot.backports import Iterable, batched
from pywikibot.tools import (
classproperty,
deprecated,
@@ -37,7 +37,7 @@
param_modules = ('list', 'meta', 'prop')
_action_modules: frozenset[str]
- _modules: Dict[str, Set[str] | Dict[str, str]]
+ _modules: dict[str, set[str] | dict[str, str]]
@remove_last_args(['modules_only_mode'])
def __init__(self,
diff --git a/pywikibot/data/sparql.py b/pywikibot/data/sparql.py
index ea06b32..01298a3 100644
--- a/pywikibot/data/sparql.py
+++ b/pywikibot/data/sparql.py
@@ -14,7 +14,6 @@
from requests.exceptions import Timeout
from pywikibot import Site
-from pywikibot.backports import Dict
from pywikibot.comms import http
from pywikibot.data import WaitingMixin
from pywikibot.exceptions import Error, NoUsernameError, ServerError
@@ -112,7 +111,7 @@
result = []
qvars = data['head']['vars']
for row in data['results']['bindings']:
- values: Dict[str, Any] = {}
+ values: dict[str, Any] = {}
for var in qvars:
if var not in row:
# var is not available (OPTIONAL is probably used)
diff --git a/pywikibot/site/_siteinfo.py b/pywikibot/site/_siteinfo.py
index 46c6b9b..b428850 100644
--- a/pywikibot/site/_siteinfo.py
+++ b/pywikibot/site/_siteinfo.py
@@ -14,7 +14,6 @@
from typing import TYPE_CHECKING, Any, Literal, cast
import pywikibot
-from pywikibot.backports import Dict, List
from pywikibot.exceptions import APIError
from pywikibot.tools.collections import EMPTY_DEFAULT
@@ -96,22 +95,22 @@
# query this method to actually get the version number
if prop == 'general':
- data = cast(Dict[str, Any], data)
+ data = cast(dict[str, Any], data)
for key in 'thumblimits', 'imagelimits':
data[key] = list(data[key].values())
data['magiclinks'] = [k for k, v in data['magiclinks'].items()
if v]
elif prop == 'namespaces':
- data = cast(Dict[str, Any], data)
+ data = cast(dict[str, Any], data)
for ns_info in data.values():
ns_info['*'] = ns_info['name']
elif prop in ('languages', 'namespacealiases'):
- data = cast(List[Dict[str, Any]], data)
+ data = cast(list[dict[str, Any]], data)
for ns_info in data:
key = 'name' if 'name' in ns_info else 'alias'
ns_info['*'] = ns_info[key]
elif prop == 'skins':
- data = cast(List[Dict[str, Any]], data)
+ data = cast(list[dict[str, Any]], data)
for ns_info in data:
ns_info['*'] = ns_info['name']
for key in 'default', 'unusable':
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1200450?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: If52fa835c520ef5d5c50b33fe00379c2cbfae9b4
Gerrit-Change-Number: 1200450
Gerrit-PatchSet: 2
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]
