jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/515155 )
Change subject: Clarify docstring
......................................................................
Clarify docstring
"It's" should have been "its", taking the oportunity to clarify
further.
Change-Id: I079bf94ab5fc164c3bad3977f98cb41bfe9c54ba
---
M pywikibot/bot.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Dvorapa: Looks good to me, but someone else must approve
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index e161e27..25f3771 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -1674,7 +1674,7 @@
return page
def skip_page(self, page):
- """Skip page it's site is not on the defined site."""
+ """Skip page if it is not on the defined site."""
if page.site != self.site:
pywikibot.warning(
fill('Skipped {page} due to: '
--
To view, visit https://gerrit.wikimedia.org/r/515155
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: I079bf94ab5fc164c3bad3977f98cb41bfe9c54ba
Gerrit-Change-Number: 515155
Gerrit-PatchSet: 1
Gerrit-Owner: Lokal Profil <andre.costa(a)wikimedia.se>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/508516 )
Change subject: [IMPR] Move skipping conditions into skip_page in welcome.py
......................................................................
[IMPR] Move skipping conditions into skip_page in welcome.py
- Move skipping conditions into skip_page and reduce code complexity
of run method a lot.
- skip_page method can be easily reused when run method is changed to treat
detached from Iff53f38
Change-Id: If3641e2ab4c851fd3f957f46680dfa3bef9b2040
---
M scripts/welcome.py
1 file changed, 37 insertions(+), 27 deletions(-)
Approvals:
Lokal Profil: Looks good to me, approved
Framawiki: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/scripts/welcome.py b/scripts/welcome.py
index a2335a8..add95e9 100755
--- a/scripts/welcome.py
+++ b/scripts/welcome.py
@@ -777,26 +777,48 @@
self._randomSignature = creg.findall(sign_text)
return self._randomSignature
+ def skip_page(self, users):
+ """Check whether the user is to be skipped."""
+ if users.isBlocked():
+ showStatus(3)
+ pywikibot.output('{} has been blocked!'
+ .format(users.username))
+
+ elif 'bot' in users.groups():
+ showStatus(3)
+ pywikibot.output('{} is a bot!'
+ .format(users.username))
+
+ elif 'bot' in users.username.lower():
+ showStatus(3)
+ pywikibot.output('{} might be a global bot!'
+ .format(users.username))
+
+ elif users.editCount() == 0:
+ if not globalvar.quiet:
+ showStatus(1)
+ pywikibot.output('{} has no contributions.'
+ .format(users.username))
+
+ elif users.editCount() < globalvar.attachEditCount:
+ showStatus(1)
+ pywikibot.output('{0} has only {1} contributions.'
+ .format(users.username,
+ users.editCount()))
+
+ else:
+ return super(WelcomeBot, self).skip_page(users)
+
+ return True
+
def run(self):
"""Run the bot."""
while True:
welcomed_count = 0
for users in self.parseNewUserLog():
- if users.isBlocked():
- showStatus(3)
- pywikibot.output('{} has been blocked!'
- .format(users.username))
+ if self.skip_page(users):
continue
- if 'bot' in users.groups():
- showStatus(3)
- pywikibot.output('{} is a bot!'
- .format(users.username))
- continue
- if 'bot' in users.username.lower():
- showStatus(3)
- pywikibot.output('{} might be a global bot!'
- .format(users.username))
- continue
+
if users.editCount() >= globalvar.attachEditCount:
showStatus(2)
pywikibot.output('{} has enough edits to be welcomed.'
@@ -854,19 +876,7 @@
else:
continue
# If we haven't to report, do nothing.
- else:
- if users.editCount() == 0:
- if not globalvar.quiet:
- showStatus(1)
- pywikibot.output('{} has no contributions.'
- .format(users.username))
- else:
- showStatus(1)
- pywikibot.output('{0} has only {1} contributions.'
- .format(users.username,
- users.editCount()))
- # That user mustn't be welcomed.
- continue
+
if globalvar.makeWelcomeLog and welcomed_count > 0:
showStatus()
if welcomed_count == 1:
--
To view, visit https://gerrit.wikimedia.org/r/508516
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: If3641e2ab4c851fd3f957f46680dfa3bef9b2040
Gerrit-Change-Number: 508516
Gerrit-PatchSet: 6
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Lokal Profil <andre.costa(a)wikimedia.se>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/513726 )
Change subject: [tests] test ranges of maximum items
......................................................................
[tests] test ranges of maximum items
There are two tests that PageGenerator yields the requested
amount of pages which can combined and expanded. The new
method also tests not to get more items if query stops.
Change-Id: I78b2354f4f00af59bacc8e0c4646e722bea9b50b
---
M tests/api_tests.py
1 file changed, 5 insertions(+), 8 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/api_tests.py b/tests/api_tests.py
index 9cd52b3..f08dbe8 100644
--- a/tests/api_tests.py
+++ b/tests/api_tests.py
@@ -653,15 +653,12 @@
r"invalid literal for int\(\) with base 10: 'test'"):
self.gen.set_maximum_items('test')
- def test_limit_equal_total(self):
+ def test_limit_range(self):
"""Test that PageGenerator yields the requested amount of pages."""
- self.gen.set_maximum_items(4)
- self.assertPageTitlesEqual(self.gen, self.titles)
-
- def test_limit_one(self):
- """Test that PageGenerator yields the requested amount of pages."""
- self.gen.set_maximum_items(1)
- self.assertPageTitlesEqual(self.gen, self.titles[0:1])
+ for i in range(1, 6):
+ with self.subTest(amount=i):
+ self.gen.set_maximum_items(i)
+ self.assertPageTitlesEqual(self.gen, self.titles[:i])
def test_limit_zero(self):
"""Test that a limit of zero is the same as limit None."""
--
To view, visit https://gerrit.wikimedia.org/r/513726
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: I78b2354f4f00af59bacc8e0c4646e722bea9b50b
Gerrit-Change-Number: 513726
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: jenkins-bot (75)