jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/477213 ) Change subject: [doc] Update doc to use site.mw_version instead of MediaWikiVersion ...................................................................... [doc] Update doc to use site.mw_version instead of MediaWikiVersion Also use bare version/test_version string in site_tests because self._version is a site.mw_version Change-Id: Ia8c8864150967890e531c88a1892656aaf23462f --- M pywikibot/family.py M pywikibot/site.py M tests/site_tests.py 3 files changed, 5 insertions(+), 6 deletions(-) Approvals: Dvorapa: Looks good to me, but someone else must approve Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/family.py b/pywikibot/family.py index bd769bb..331a0f2 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -1322,7 +1322,7 @@ def version(self, code): """Return MediaWiki version number as a string. - Use L{pywikibot.tools.MediaWikiVersion} to compare version strings. + Use L{pywikibot.site.mw_version} to compare version strings. """ # Here we return the latest mw release for downloading if not hasattr(self, '_version'): @@ -1356,7 +1356,7 @@ def versionnumber(self, code): """DEPRECATED, use version() instead. - Use L{pywikibot.tools.MediaWikiVersion} to compare version strings. + Use L{pywikibot.site.mw_version} to compare version strings. Return an int identifying MediaWiki version. Currently this is implemented as returning the minor version diff --git a/pywikibot/site.py b/pywikibot/site.py index 0a2c5c6..051c458 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -2742,7 +2742,7 @@ Return live project version number as a string. This overwrites the corresponding family method for APISite class. Use - L{pywikibot.tools.MediaWikiVersion} to compare MediaWiki versions. + L{pywikibot.site.mw_version} to compare MediaWiki versions. """ version = self.force_version() if not version: diff --git a/tests/site_tests.py b/tests/site_tests.py index 211f0e8..3b94764 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -25,7 +25,6 @@ from pywikibot.data import api from pywikibot.exceptions import HiddenKeyError from pywikibot.tools import ( - MediaWikiVersion, PY2, StringTypes as basestring, suppress_warnings, @@ -2227,12 +2226,12 @@ def _test_tokens(self, version, test_version, additional_token): """Test tokens.""" - if version and self._version < MediaWikiVersion(version): + if version and self._version < version: raise unittest.SkipTest( 'Site {} version {} is too low for this tests.' .format(self.mysite, self._version)) - if version and self._version < MediaWikiVersion(test_version): + if version and self._version < test_version: raise unittest.SkipTest( 'Site {} version {} is too low for this tests.' .format(self.mysite, self._version)) -- To view, visit https://gerrit.wikimedia.org/r/477213 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ia8c8864150967890e531c88a1892656aaf23462f Gerrit-Change-Number: 477213 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: Dalba &lt;dalba.wiki(a)gmail.com&gt; Gerrit-Reviewer: Dvorapa &lt;dvorapa(a)seznam.cz&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot (75)