jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/491240 )
Change subject: [bugfix] Fix detection of Pywikibot sub-modules
......................................................................
[bugfix] Fix detection of Pywikibot sub-modules
- bug found in
https://gerrit.wikimedia.org/r/#/c/pywikibot/core/+/491217/
Signed-off-by: xqt <info(a)gno.de>
Change-Id: Idd821c932e2f855fcf3a89e0794756170b01f87c
---
M pywikibot/version.py
1 file changed, 21 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
Zhuyifei1999: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/pywikibot/version.py b/pywikibot/version.py
index e0ce6ed..426ae08 100644
--- a/pywikibot/version.py
+++ b/pywikibot/version.py
@@ -2,7 +2,7 @@
"""Module to determine the pywikibot version (tag, revision and
date)."""
#
# (C) Merlijn 'valhallasw' van Deen, 2007-2014
-# (C) xqt, 2010-2018
+# (C) xqt, 2010-2019
# (C) Pywikibot team, 2007-2019
#
# Distributed under the terms of the MIT license.
@@ -33,6 +33,14 @@
except ImportError as e:
svn_utils = e
+try:
+ import pathlib
+except ImportError:
+ try:
+ import pathlib2 as pathlib
+ except ImportError as e:
+ pathlib = e
+
import pywikibot
from pywikibot import config2 as config
@@ -567,8 +575,19 @@
# Remove any pywikibot sub-modules which were loaded as a package.
# e.g. 'wikipedia_family.py' is loaded as 'wikipedia'
_program_dir = _get_program_dir()
+ if isinstance(pathlib, Exception):
+ dir_parts = _program_dir.split(os.sep)
+ else:
+ dir_parts = pathlib.Path(_program_dir).parts
+ length = len(dir_parts)
for path, name in paths.items():
- if _program_dir in path:
+ if isinstance(pathlib, Exception):
+ lib_parts = os.path.normpath(path).split(os.sep)
+ else:
+ lib_parts = pathlib.Path(path).parts
+ if dir_parts != lib_parts[:length]:
+ continue
+ if lib_parts[length] != '.tox':
del data[name]
return data
--
To view, visit
https://gerrit.wikimedia.org/r/491240
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: Idd821c932e2f855fcf3a89e0794756170b01f87c
Gerrit-Change-Number: 491240
Gerrit-PatchSet: 15
Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)