jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100492?usp=email )
Change subject: cleanup remnants of importlib_metadata
......................................................................
cleanup remnants of importlib_metadata
Change-Id: Ie30f260dfc26d6723e7d35ad2816478d0716054b
---
M pywikibot/scripts/wrapper.py
M pywikibot/tools/__init__.py
2 files changed, 6 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
JJMC89: Looks good to me, approved
diff --git a/pywikibot/scripts/wrapper.py b/pywikibot/scripts/wrapper.py
index 62d4e82..6a9796e 100755
--- a/pywikibot/scripts/wrapper.py
+++ b/pywikibot/scripts/wrapper.py
@@ -49,6 +49,7 @@
#
from __future__ import annotations
+import importlib.metadata
import os
import sys
import types
@@ -233,8 +234,6 @@
:return: True if all dependencies are installed
:raise RuntimeError: wrong Python version found in setup.py
"""
- import importlib.metadata as importlib_metadata
-
from packaging.requirements import Requirement
from setup import script_deps
@@ -259,8 +258,8 @@
requirement = Requirement(dependency)
if requirement.marker is None or requirement.marker.evaluate():
try:
- instlld_vrsn = importlib_metadata.version(requirement.name)
- except importlib_metadata.PackageNotFoundError as e:
+ instlld_vrsn = importlib.metadata.version(requirement.name)
+ except importlib.metadata.PackageNotFoundError as e:
missing_requirements.append(requirement)
print(e)
else:
@@ -272,7 +271,6 @@
)
del Requirement
- del importlib_metadata
del script_deps
_print_requirements(missing_requirements, script, 'missing')
diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index db9cbd3..79060f2 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -10,7 +10,7 @@
import bz2
import gzip
import hashlib
-import importlib.metadata as importlib_metadata
+import importlib.metadata
import ipaddress
import lzma
import os
@@ -121,8 +121,8 @@
removed with Python 3.12.
"""
try:
- metadata_version = importlib_metadata.version(module)
- except importlib_metadata.PackageNotFoundError:
+ metadata_version = importlib.metadata.version(module)
+ except importlib.metadata.PackageNotFoundError:
return False
if version:
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1100492?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: Ie30f260dfc26d6723e7d35ad2816478d0716054b
Gerrit-Change-Number: 1100492
Gerrit-PatchSet: 1
Gerrit-Owner: JJMC89 <[email protected]>
Gerrit-Reviewer: JJMC89 <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
