[Pywikibot-commits] [Gerrit] [FIX] MediaWikiVersion: Accept new wmf style - change (pywikibot/core)

jenkins-bot has submitted this change and it was merged. Change subject: [FIX] MediaWikiVersion: Accept new wmf style ...................................................................... [FIX] MediaWikiVersion: Accept new wmf style With 1.27 the wmf version style changed adding a dash and period: * `MediaWiki 1.27.0-wmf.1` * `MediaWiki 1.26wmf24` This patch was manually backported from 0a6516e6 for the master branch. Bug: T114189 Change-Id: I458b44821d415be8e916978c728dc79451df376e --- M pywikibot/tools/__init__.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: John Vandenberg: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 8d9c4ff..3c783e9 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -322,7 +322,7 @@ Any other suffixes are considered invalid. """ - MEDIAWIKI_VERSION = re.compile(r'^(\d+(?:\.\d+)+)(wmf(\d+)|alpha|beta(\d+)|-?rc\.?(\d+))?$') + MEDIAWIKI_VERSION = re.compile(r'^(\d+(?:\.\d+)+)(-?wmf\.?(\d+)|alpha|beta(\d+)|-?rc\.?(\d+))?$') def parse(self, vstring): """Parse version string.""" -- To view, visit https://gerrit.wikimedia.org/r/242390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I458b44821d415be8e916978c728dc79451df376e Gerrit-PatchSet: 2 Gerrit-Project: pywikibot/core Gerrit-Branch: 2.0 Gerrit-Owner: XZise &lt;CommodoreFabianus(a)gmx.de&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: XZise &lt;CommodoreFabianus(a)gmx.de&gt; Gerrit-Reviewer: jenkins-bot <>