jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/583362 )
Change subject: [IMPR] Prefer userscripts over scripts ...................................................................... [IMPR] Prefer userscripts over scripts Add userscripts at first position in script_paths and update documentation in config2.py Bug: T248374 Change-Id: I1b37e1aa0033772ea450a6c1fbbfa7d73252d6a1 --- M pwb.py M pywikibot/config2.py 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 3d1c8a5..d4dc86d 100755 --- a/pwb.py +++ b/pwb.py @@ -282,9 +282,9 @@ """Search for the filename in the given script paths.""" from pywikibot import config - script_paths = ['scripts', - 'scripts.maintenance', - 'scripts.userscripts'] + script_paths = ['scripts.userscripts', + 'scripts', + 'scripts.maintenance'] if config.user_script_paths: if isinstance(config.user_script_paths, list): diff --git a/pywikibot/config2.py b/pywikibot/config2.py index da754de..98c489c 100644 --- a/pywikibot/config2.py +++ b/pywikibot/config2.py @@ -558,9 +558,9 @@ # # The search order is # 1. user_script_paths in the given order -# 2. scripts -# 3. scripts/maintenance -# 4. scripts/archive +# 2. scripts/userscripts +# 3. scripts +# 4. scripts/maintenance # # sample: # user_script_paths = ['scripts.myscripts'] -- To view, visit https://gerrit.wikimedia.org/r/583362 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: I1b37e1aa0033772ea450a6c1fbbfa7d73252d6a1 Gerrit-Change-Number: 583362 Gerrit-PatchSet: 3 Gerrit-Owner: Mh-3110 <bipi3...@gmail.com> Gerrit-Reviewer: Dvorapa <dvor...@seznam.cz> Gerrit-Reviewer: Xqt <i...@gno.de> Gerrit-Reviewer: jenkins-bot (75)
_______________________________________________ Pywikibot-commits mailing list Pywikibot-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits