jenkins-bot has submitted this change and it was merged.
Change subject: [tox] shorten lines beneath 100 chars.
......................................................................
[tox] shorten lines beneath 100 chars.
Change-Id: Idf2e45db2f83e9ea1a473b25430bc49b8a829e1d
---
M pywikibot/comms/rcstream.py
M scripts/harvest_template.py
M scripts/interwiki.py
3 files changed, 33 insertions(+), 16 deletions(-)
Approvals:
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/comms/rcstream.py b/pywikibot/comms/rcstream.py
index 68ebded..2cce8ae 100644
--- a/pywikibot/comms/rcstream.py
+++ b/pywikibot/comms/rcstream.py
@@ -163,7 +163,7 @@
@raises ImportError
- [1]
https://github.com/wikimedia/mediawiki/blob/master/includes/rcfeed/MachineReadableRCFeedFormatter.php
+ [1]: See mediawiki/includes/rcfeed/MachineReadableRCFeedFormatter.php
"""
try:
diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py
index ec5fc3b..c1ea88c 100755
--- a/scripts/harvest_template.py
+++ b/scripts/harvest_template.py
@@ -85,7 +85,8 @@
pywikibot.error(u'Template %s does not exist.' % temp.title())
exit()
- pywikibot.output('Finding redirects...') # Put some output here since
it can take a while
+ # Put some output here since it can take a while
+ pywikibot.output('Finding redirects...')
if temp.isRedirectPage():
temp = temp.getRedirectTarget()
titles = [page.title(withNamespace=False)
@@ -143,7 +144,9 @@
template = pywikibot.Page(page.site, template,
ns=10).title(withNamespace=False)
except pywikibot.exceptions.InvalidTitle:
- pywikibot.error(u"Failed parsing template; '%s' should be the
template name." % template)
+ pywikibot.error(
+ "Failed parsing template; '%s' should be the template
name."
+ % template)
continue
# We found the template we were looking for
if template in self.templateTitles:
@@ -191,11 +194,15 @@
if image.isRedirectPage():
image =
pywikibot.FilePage(image.getRedirectTarget())
if not image.exists():
- pywikibot.output('[[%s]] doesn\'t exist so
I can\'t link to it' % (image.title(),))
+ pywikibot.output(
+ '[[%s]] doesn\'t exist so I can\'t
link to it'
+ % (image.title(),))
continue
claim.setTarget(image)
else:
- pywikibot.output("%s is not a supported
datatype." % claim.type)
+ pywikibot.output(
+ '%s is not a supported datatype.'
+ % claim.type)
continue
pywikibot.output('Adding %s --> %s'
diff --git a/scripts/interwiki.py b/scripts/interwiki.py
index 58c46b1..5e51723 100755
--- a/scripts/interwiki.py
+++ b/scripts/interwiki.py
@@ -358,7 +358,8 @@
import pywikibot
-from pywikibot import config, i18n, pagegenerators, textlib, interwiki_graph,
titletranslate
+from pywikibot import config, i18n, pagegenerators, textlib, interwiki_graph
+from pywikibot import titletranslate
from pywikibot.bot import ListOption, StandardOption
from pywikibot.tools import first_upper
@@ -584,7 +585,8 @@
elif arg.startswith('-neverlink:'):
self.neverlink += arg[11:].split(",")
elif arg.startswith('-ignore:'):
- self.ignore += [pywikibot.Page(pywikibot.Site(), p) for p in
arg[8:].split(",")]
+ self.ignore += [pywikibot.Page(pywikibot.Site(), p)
+ for p in arg[8:].split(',')]
elif arg.startswith('-ignorefile:'):
ignorefile = arg[12:]
ignorePageGen = pagegenerators.TextfilePageGenerator(ignorefile)
@@ -1055,7 +1057,8 @@
return False
if globalvar.autonomous:
pywikibot.output(
-u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i."
+ 'NOTE: Ignoring link from page %s in namespace %i to page '
+ '%s in namespace %i.'
% (linkingPage, linkingPage.namespace(), linkedPage,
linkedPage.namespace()))
# Fill up foundIn, so that we will not write this notice
@@ -1065,14 +1068,16 @@
preferredPage =
self.getFoundInCorrectNamespace(linkedPage.site)
if preferredPage:
pywikibot.output(
-u"NOTE: Ignoring link from page %s in namespace %i to page %s in namespace %i "
-u"because page %s in the correct namespace has already been found."
+ 'NOTE: Ignoring link from page %s in namespace %i to '
+ 'page %s in namespace %i because page %s in the '
+ 'correct namespace has already been found.'
% (linkingPage, linkingPage.namespace(), linkedPage,
linkedPage.namespace(), preferredPage))
return True
else:
choice = pywikibot.input_choice(
-u'WARNING: %s is in namespace %i, but %s is in namespace %i. Follow it anyway?'
+ 'WARNING: %s is in namespace %i, but %s is in '
+ 'namespace %i. Follow it anyway?'
% (self.originPage, self.originPage.namespace(),
linkedPage, linkedPage.namespace()),
[('Yes', 'y'), ('No', 'n'),
@@ -1458,8 +1463,9 @@
linkedPage = pywikibot.Page(link)
if globalvar.hintsareright:
if linkedPage.site in self.hintedsites:
- pywikibot.output(u"NOTE: %s: %s extra interwiki on
hinted site ignored %s"
- % (self.originPage, page, linkedPage))
+ pywikibot.output(
+ 'NOTE: %s: %s extra interwiki on hinted site
ignored %s'
+ % (self.originPage, page, linkedPage))
break
if not self.skipPage(page, linkedPage, counter):
if globalvar.followinterwiki or page == self.originPage:
@@ -1912,7 +1918,8 @@
):
new[rmsite] = rmPage
pywikibot.output(
- u"WARNING: %s is either deleted or has a mismatching
disambiguation state."
+ 'WARNING: %s is either deleted or has a mismatching '
+ 'disambiguation state.'
% rmPage)
# Re-Check what needs to get done
mods, mcomment, adding, removing, modifying = compareLanguages(old,
@@ -2196,7 +2203,9 @@
except KeyError:
pass
if loc is not None and loc in page.title():
- pywikibot.output(u'Skipping: %s is a templates
subpage' % page.title())
+ pywikibot.output(
+ 'Skipping: %s is a templates subpage'
+ % page.title())
continue
break
@@ -2265,7 +2274,8 @@
except pywikibot.ServerError:
# Could not extract allpages special page?
pywikibot.output(
- u'ERROR: could not retrieve more pages. Will try
again in %d seconds'
+ 'ERROR: could not retrieve more pages. '
+ 'Will try again in %d seconds'
% timeout)
time.sleep(timeout)
timeout *= 2
--
To view, visit https://gerrit.wikimedia.org/r/231896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idf2e45db2f83e9ea1a473b25430bc49b8a829e1d
Gerrit-PatchSet: 5
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <i...@gno.de>
Gerrit-Reviewer: John Vandenberg <jay...@gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgr...@gmail.com>
Gerrit-Reviewer: XZise <commodorefabia...@gmx.de>
Gerrit-Reviewer: Xqt <i...@gno.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
Pywikibot-commits mailing list
Pywikibot-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
