jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1361143?usp=email )
Change subject: version: Remove deprecated get_toolforge_hostname helper
......................................................................
version: Remove deprecated get_toolforge_hostname helper
The helper was deprecated in Pywikibot 9 with no replacement and is
scheduled for removal in Pywikibot 12. Remove it, its unused imports,
and its pending-removal entry from ROADMAP.rst.
The existing local version tests pass (3 tests).
Change-Id: I0ca30cf2346f23691560c7652bbbbd9eeabc051a
---
M ROADMAP.rst
M pywikibot/version.py
2 files changed, 0 insertions(+), 18 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/ROADMAP.rst b/ROADMAP.rst
index a9e45d0..f06960a 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -53,7 +53,6 @@
<pywikibot.site._apisite.APISite.namespace>` was renamed to ``all_ns``
* 9.0.0: ``filter`` parameter of :func:`date.dh` was renamed to ``filter_func``
* 9.0.0: ``dict`` parameter of :class:`data.api.OptionSet` was renamed to
``data``
-* 9.0.0: :func:`version.get_toolforge_hostname` is deprecated with no
replacement
* 9.0.0: ``allrevisions`` parameter of :class:`xmlreader.XmlDump` is
deprecated, use ``revisions`` instead
(:phab:`T340804`)
* 9.0.0: ``iteritems`` method of :class:`data.api.Request` will be removed in
favour of ``items``
diff --git a/pywikibot/version.py b/pywikibot/version.py
index e46f5b9..a68541f 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -10,7 +10,6 @@
import json
import os
import pathlib
-import socket
import subprocess
import sys
import sysconfig
@@ -25,28 +24,12 @@
from pywikibot import config
from pywikibot.comms.http import fetch
from pywikibot.exceptions import VersionParseError
-from pywikibot.tools import deprecated
def _get_program_dir() -> str:
return os.path.normpath(os.path.split(os.path.dirname(__file__))[0])
-@deprecated(since='9.0.0')
-def get_toolforge_hostname() -> str | None:
- """Get hostname of the current Toolforge host.
-
- .. version-added:: 3.0
- .. version-deprecated:: 9.0
-
- :return: The hostname of the currently running host,
- if it is in Wikimedia Toolforge; otherwise return None.
- """
- if socket.getfqdn().endswith('.tools.eqiad1.wikimedia.cloud'):
- return socket.gethostname()
- return None
-
-
def getversion(online: bool = True) -> str:
"""Return a pywikibot version string.
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1361143?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: I0ca30cf2346f23691560c7652bbbbd9eeabc051a
Gerrit-Change-Number: 1361143
Gerrit-PatchSet: 2
Gerrit-Owner: Mahveotm <[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]
