jenkins-bot has submitted this change and it was merged.
Change subject: Remove pywikibot modules if import failed
......................................................................
Remove pywikibot modules if import failed
7634a05 introduced an `import tools` in config,
which loaded pywikibot.tools into sys.modules
even if importing pywikibot fails.
This caused errors when pwb attempted to import
generate_family_file after importing pywikibot failed
due to user-config.py not existing.
Bug: T113161
Change-Id: Ia9521def534ecb9e5626d092162b2fe326a6022e
---
M pwb.py
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pwb.py b/pwb.py
index 7d8ee4f..3cd3abe 100755
--- a/pwb.py
+++ b/pwb.py
@@ -56,6 +56,13 @@
pwb = None
+def remove_modules():
+ """Remove pywikibot modules."""
+ for name in list(sys.modules):
+ if name.startswith('pywikibot'):
+ del sys.modules[name]
+
+
def tryimport_pwb():
"""Try to import pywikibot.
@@ -68,6 +75,8 @@
import pywikibot # noqa
pwb = pywikibot
except RuntimeError:
+ remove_modules()
+
pwb = lambda: None
pwb.argvu = []
--
To view, visit
https://gerrit.wikimedia.org/r/239645
To unsubscribe, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia9521def534ecb9e5626d092162b2fe326a6022e
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>