jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332131 )
Change subject: bot.py: Remove the unused automatic_quit parameter from input_list_choice
......................................................................
bot.py: Remove the unused automatic_quit parameter from input_list_choice
Change-Id: Ie46d219a4f52e8741f24f3cd69d59274be29747d
---
M pywikibot/bot.py
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index fcd1a22..82f24ef 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -505,8 +505,7 @@
automatic_quit=False)
-def input_list_choice(question, answers, default=None,
- automatic_quit=True, force=False):
+def input_list_choice(question, answers, default=None, force=False):
"""
Ask the user the question and return one of the valid answers.
@@ -1632,7 +1631,7 @@
A bot which automatically sets 'current_page' on each treat().
This class should be always used together with either the MultipleSitesBot
- or SingleSiteBot class as there is no site managment in this class.
+ or SingleSiteBot class as there is no site management in this class.
"""
ignore_save_related_errors = True
--
To view, visit https://gerrit.wikimedia.org/r/332131
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie46d219a4f52e8741f24f3cd69d59274be29747d
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331965 )
Change subject: [bugfix] Fix for positional_arg behavior of GeneratorFactory
......................................................................
[bugfix] Fix for positional_arg behavior of GeneratorFactory
When a positional arg is used by GeneratorFactory the argument may contain
a colon. The colon splits the option arg from the option value. This patch
enables positional arguments with colon inside.
Test added. Also fix old test method.
Bug: T155227
Change-Id: Id61dfd57e514a845d952b1d710b0bf7295fc0a1c
---
M pywikibot/pagegenerators.py
M tests/pagegenerators_tests.py
2 files changed, 20 insertions(+), 6 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 61dacdb..c290fd6 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -14,7 +14,7 @@
¶ms;
"""
#
-# (C) Pywikibot team, 2008-2016
+# (C) Pywikibot team, 2008-2017
#
# Distributed under the terms of the MIT license.
#
@@ -632,14 +632,15 @@
"""Return None if v is None or '' else return int(v)."""
return v if (v is None or v is '') else int(v)
- arg, sep, value = arg.partition(':')
- if value == '':
- value = None
-
gen = None
if not arg.startswith('-') and self._positional_arg_name:
value = arg
arg = '-' + self._positional_arg_name
+ else:
+ arg, sep, value = arg.partition(':')
+
+ if value == '':
+ value = None
if arg == '-filelinks':
if not value:
diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index d8061c4..77eba56 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -1028,7 +1028,20 @@
self.assertIsNotNone(gen1)
gf2 = pagegenerators.GeneratorFactory(site=self.site)
gf2.handleArg('-page:Main Page')
- gen2 = gf1.getCombinedGenerator()
+ gen2 = gf2.getCombinedGenerator()
+ self.assertIsNotNone(gen2)
+ self.assertEqual(list(gen1), list(gen2))
+
+ def test_positionalargument_with_colon(self):
+ """Test page generator with positional argument with colon."""
+ gf1 = pagegenerators.GeneratorFactory(site=self.site,
+ positional_arg_name='page')
+ gf1.handleArg('Project:Main Page')
+ gen1 = gf1.getCombinedGenerator()
+ self.assertIsNotNone(gen1)
+ gf2 = pagegenerators.GeneratorFactory(site=self.site)
+ gf2.handleArg('-page:Project:Main Page')
+ gen2 = gf2.getCombinedGenerator()
self.assertIsNotNone(gen2)
self.assertEqual(list(gen1), list(gen2))
--
To view, visit https://gerrit.wikimedia.org/r/331965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id61dfd57e514a845d952b1d710b0bf7295fc0a1c
Gerrit-PatchSet: 4
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Urbanecm <martin.urbanec(a)wikimedia.cz>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/329058 )
Change subject: Check for common class when comparing with string
......................................................................
Check for common class when comparing with string
Change-Id: I65ff47ae4f20e14b19499d50295054e46264185e
---
M pywikibot/page.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 586e907..e7aa8e3 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -4726,7 +4726,7 @@
The function checks for:
- - ItemPage ID equality
+ - WikibasePage ID equality
- WbTime year equality
- Coordinate equality, regarding precision
- WbMonolingualText text equality
@@ -4737,7 +4737,7 @@
false otherwise
@rtype: bool
"""
- if (isinstance(self.target, pywikibot.ItemPage) and
+ if (isinstance(self.target, WikibasePage) and
isinstance(value, basestring)):
return self.target.id == value
--
To view, visit https://gerrit.wikimedia.org/r/329058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I65ff47ae4f20e14b19499d50295054e46264185e
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Magul <tomasz.magulski(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot <>