jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/462124 )
Change subject: [test] docs/requirements-py3.txt: Do not install sphinx >=1.8.0
......................................................................
[test] docs/requirements-py3.txt: Do not install sphinx >=1.8.0
Bug: T204189
Change-Id: I870cce4fcce157629b2238d178bcbde6ed5820b5
---
M docs/requirements-py3.txt
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/docs/requirements-py3.txt b/docs/requirements-py3.txt
index 55c181b..194ce1b 100644
--- a/docs/requirements-py3.txt
+++ b/docs/requirements-py3.txt
@@ -2,6 +2,6 @@
# using sphinx on python3.4.
# requirements.txt and pywikibot[security] are also needed
-sphinx!=1.8.0
+sphinx<1.8.0
sphinx-epytext>=0.0.4
unidiff
--
To view, visit https://gerrit.wikimedia.org/r/462124
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: I870cce4fcce157629b2238d178bcbde6ed5820b5
Gerrit-Change-Number: 462124
Gerrit-PatchSet: 1
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: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/460759 )
Change subject: [doc] Show pagegenerators options with imagetransfer.py
......................................................................
[doc] Show pagegenerators options with imagetransfer.py
- show pagegenerators options with -help
- additional hint with suggest_help
Bug: T204448
Change-Id: I637c737a5d6b1fb2da9295d2ce2212917930200d
---
M scripts/imagetransfer.py
1 file changed, 11 insertions(+), 2 deletions(-)
Approvals:
Framawiki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py
index 6f606df..9719a55 100755
--- a/scripts/imagetransfer.py
+++ b/scripts/imagetransfer.py
@@ -5,7 +5,7 @@
Syntax:
- python pwb.py imagetransfer pagename [-interwiki] [-tolang:x] [-tofamily:y]
+ python pwb.py imagetransfer {<pagename>|<generator>} [<options>]
Arguments:
@@ -24,6 +24,8 @@
target site. If it is a normal page, it will offer to copy any of the images
used on that page, or if the -interwiki argument is used, any of the images
used on a page reachable via interwiki links.
+
+¶ms;
"""
#
# (C) Andre Engels, 2004
@@ -42,6 +44,11 @@
from pywikibot.specialbots import UploadRobot
+docuReplacements = {
+ '¶ms;': pagegenerators.parameterHelp
+}
+
+
nowCommonsTemplate = {
'ar': '{{الآن كومنز|%s}}',
'de': '{{NowCommons|%s}}',
@@ -309,7 +316,9 @@
gen = generator_factory.getCombinedGenerator()
if not gen:
- pywikibot.bot.suggest_help(missing_parameters=['page'])
+ pywikibot.bot.suggest_help(
+ missing_parameters=['page'],
+ additional_text='and no other generator was defined.')
return False
if not targetLang and not targetFamily:
--
To view, visit https://gerrit.wikimedia.org/r/460759
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: I637c737a5d6b1fb2da9295d2ce2212917930200d
Gerrit-Change-Number: 460759
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
Gerrit-CC: Dvorapa <dvorapa(a)seznam.cz>
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/461110 )
Change subject: [IMPR] Use a set to lookup pages to be ignored
......................................................................
[IMPR] Use a set to lookup pages to be ignored
Change-Id: Ie4ad8a6c6b5f1d87607847c9e209aeb5f0a61062
---
M scripts/solve_disambiguation.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Framawiki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py
index 823f513..0765898 100755
--- a/scripts/solve_disambiguation.py
+++ b/scripts/solve_disambiguation.py
@@ -460,7 +460,7 @@
"""
self.disambPage = disambPage
self.enabled = enabled
- self.ignorelist = []
+ self.ignorelist = set()
folder = config.datafilepath('disambiguations')
if os.path.exists(folder):
@@ -484,7 +484,7 @@
line = line.rstrip('\r\n')
# skip empty lines
if line:
- self.ignorelist.append(line)
+ self.ignorelist.add(line)
except IOError:
pass
--
To view, visit https://gerrit.wikimedia.org/r/461110
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: Ie4ad8a6c6b5f1d87607847c9e209aeb5f0a61062
Gerrit-Change-Number: 461110
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/461089 )
Change subject: [IMPR] Improvements for solve_disambiguation.py
......................................................................
[IMPR] Improvements for solve_disambiguation.py
- firstlinks() becomes a generator
- titles in firstize() becomes a set for lookup
Change-Id: I145aad348cf0590e5773f2a042cc28e4701af152
---
M scripts/solve_disambiguation.py
1 file changed, 3 insertions(+), 6 deletions(-)
Approvals:
Framawiki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py
index 823f513..53444bc 100755
--- a/scripts/solve_disambiguation.py
+++ b/scripts/solve_disambiguation.py
@@ -715,13 +715,11 @@
Lines without an asterisk at the beginning will be disregarded.
No check for page existence, it has already been done.
"""
- links = []
reg = re.compile(r'\*.*?\[\[(.*?)(?:\||\]\])')
- for line in page.get().splitlines():
+ for line in page.text.splitlines():
found = reg.match(line)
if found:
- links.append(found.group(1))
- return links
+ yield found.group(1)
def firstize(self, page, links):
"""Call firstlinks and remove extra links.
@@ -729,9 +727,8 @@
This will remove a lot of silly redundant links from overdecorated
disambiguation pages and leave the first link of each asterisked
line only. This must be done if -first is used in command line.
-
"""
- titles = [firstcap(t) for t in self.firstlinks(page)]
+ titles = {firstcap(t) for t in self.firstlinks(page)}
links = list(links)
for l in links[:]: # uses a copy because of remove!
if l.title() not in titles:
--
To view, visit https://gerrit.wikimedia.org/r/461089
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: I145aad348cf0590e5773f2a042cc28e4701af152
Gerrit-Change-Number: 461089
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Bináris <wikiposta(a)gmail.com>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/434051 )
Change subject: [bugfix] Raise AttributeError in Site if the family attribute is not callable
......................................................................
[bugfix] Raise AttributeError in Site if the family attribute is not callable
Bug: T195088
Change-Id: Ic05dd51aec28fea167f16df662a52f1987985663
---
M pywikibot/site.py
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Framawiki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 2eb4141..1ca42dd 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -896,6 +896,8 @@
return getattr(self.__class__, attr)
try:
method = getattr(self.family, attr)
+ if not callable(method):
+ raise AttributeError
f = functools.partial(method, self.code)
if hasattr(method, "__doc__"):
f.__doc__ = method.__doc__
--
To view, visit https://gerrit.wikimedia.org/r/434051
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: Ic05dd51aec28fea167f16df662a52f1987985663
Gerrit-Change-Number: 434051
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)