jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1354007?usp=email )
Change subject: pagegenerators: Normalize usernames in user edit filter
......................................................................
pagegenerators: Normalize usernames in user edit filter
Normalize the username before looking up page contributors so template.py
-skipuser and -onlyuser match canonical API names when input uses underscores
or a lowercase initial letter.
Change-Id: Ife52bbd8149d7f9ea84833131b5be262c8ce4ce4
---
M pywikibot/pagegenerators/_filters.py
M tests/pagegenerators_tests.py
2 files changed, 16 insertions(+), 0 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators/_filters.py
b/pywikibot/pagegenerators/_filters.py
index 32aa660..d23da79 100644
--- a/pywikibot/pagegenerators/_filters.py
+++ b/pywikibot/pagegenerators/_filters.py
@@ -16,6 +16,7 @@
from pywikibot import config
from pywikibot.exceptions import NoPageError
from pywikibot.proofreadpage import ProofreadPage
+from pywikibot.tools import normalize_username
from pywikibot.tools.itertools import filter_unique
@@ -456,6 +457,7 @@
by max_revision_depth
:param show_filtered: Output a message for each page not yielded
"""
+ username = normalize_username(username) or ''
if timestamp is None:
ts = None
else:
diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index fd759ad..5f7707c 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -10,6 +10,7 @@
import datetime
import sys
import unittest
+from collections import Counter
from contextlib import suppress
from unittest import mock
@@ -185,6 +186,19 @@
self.assertIs(pages[0], unfiltered_page)
unfiltered_page.categories.assert_not_called()
+ def test_user_edit_filter_normalizes_username(self) -> None:
+ """Test matching a noncanonical username in both filter modes."""
+ edited_page = mock.Mock()
+ edited_page.contributors.return_value = Counter({'John doe': 1})
+ other_page = mock.Mock()
+ other_page.contributors.return_value = Counter({'Other user': 1})
+ pages = [edited_page, other_page]
+
+ self.assertEqual(list(pagegenerators.UserEditFilterGenerator(
+ pages, 'john_doe')), [edited_page])
+ self.assertEqual(list(pagegenerators.UserEditFilterGenerator(
+ pages, 'john_doe', skip=True)), [other_page])
+
def test_RegexFilterPageGenerator(self) -> None:
"""Test RegexFilterPageGenerator."""
self.assertFunction('RegexFilterPageGenerator')
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1354007?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Ife52bbd8149d7f9ea84833131b5be262c8ce4ce4
Gerrit-Change-Number: 1354007
Gerrit-PatchSet: 3
Gerrit-Owner: Mahveotm <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
