jenkins-bot has submitted this change and it was merged.
Change subject: [flake8] Remove obsolete site.pageinterwiki() method, add some
docstrings
......................................................................
[flake8] Remove obsolete site.pageinterwiki() method, add some docstrings
- Remove explicit unicode literals in editarticle which are no longer needed
due to "from __future__ import unicode_literals"
- Add two files to the flake8-docstrings-mandatory section
Change-Id: I51ce5eb9827af03e491a364f87de5a6744ce1c38
---
M pywikibot/cosmetic_changes.py
M pywikibot/family.py
M pywikibot/page.py
M pywikibot/site.py
M scripts/editarticle.py
M scripts/noreferences.py
M tox.ini
7 files changed, 20 insertions(+), 12 deletions(-)
Approvals:
John Vandenberg: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py
index bced95d..ac6c7cf 100755
--- a/pywikibot/cosmetic_changes.py
+++ b/pywikibot/cosmetic_changes.py
@@ -213,6 +213,7 @@
@deprecate_arg('debug', 'diff')
def __init__(self, site, diff=False, redirect=False, namespace=None,
pageTitle=None, ignore=CANCEL_ALL):
+ """Constructor."""
self.site = site
self.diff = diff
self.redirect = redirect
@@ -624,6 +625,7 @@
return text
def removeUselessSpaces(self, text):
+ """Cleanup multiple or trailing spaces."""
multipleSpacesR = re.compile(' +')
spaceAtLineEndR = re.compile(' $')
exceptions = ['comment', 'math', 'nowiki', 'pre', 'startspace',
'table',
diff --git a/pywikibot/family.py b/pywikibot/family.py
index c6566c9..1df55fe 100644
--- a/pywikibot/family.py
+++ b/pywikibot/family.py
@@ -46,6 +46,7 @@
"""Parent class for all wiki families."""
def __init__(self):
+ """Constructor."""
if not hasattr(self, 'name'):
self.name = None
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 86290c7..ba3a58d 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -1858,6 +1858,7 @@
@deprecated('Page.is_flow_page()')
def isFlowPage(self):
+ """DEPRECATED: use self.is_flow_page instead."""
return self.is_flow_page()
def is_flow_page(self):
diff --git a/pywikibot/site.py b/pywikibot/site.py
index 2bd2c6b..f8e9c6d 100644
--- a/pywikibot/site.py
+++ b/pywikibot/site.py
@@ -3359,10 +3359,6 @@
raise NoPage(page)
api.update_page(page, pagedata, rvgen.props)
- def pageinterwiki(self, page):
- # No such function in the API (this method isn't called anywhere)
- raise NotImplementedError
-
def pagelanglinks(self, page, step=None, total=None,
include_obsolete=False):
"""Iterate all interlanguage links on page, yielding Link objects.
diff --git a/scripts/editarticle.py b/scripts/editarticle.py
index db48b77..ad0b422 100755
--- a/scripts/editarticle.py
+++ b/scripts/editarticle.py
@@ -23,7 +23,7 @@
"""
#
# (C) Gerrit Holl, 2004
-# (C) Pywikibot team, 2004-2014
+# (C) Pywikibot team, 2004-2015
#
# Distributed under the terms of the MIT license.
#
@@ -51,6 +51,7 @@
# joinchars = string.letters + '[]' + string.digits
def __init__(self, *args):
+ """Constructor."""
self.set_options(*args)
self.setpage()
self.site = pywikibot.Site()
@@ -70,28 +71,31 @@
self.options = parser.parse_args(my_args)
if self.options.page and self.options.wikipage:
- pywikibot.error(u"Multiple pages passed. Please specify a single
page to edit.")
+ pywikibot.error("Multiple pages passed. Please specify a single "
+ "page to edit.")
sys.exit(1)
self.options.page = self.options.page or self.options.wikipage
def setpage(self):
"""Set page and page title."""
site = pywikibot.Site()
- pageTitle = self.options.page or pywikibot.input(u"Page to edit:")
+ pageTitle = self.options.page or pywikibot.input("Page to edit:")
self.page = pywikibot.Page(pywikibot.Link(pageTitle, site))
if not self.options.edit_redirect and self.page.isRedirectPage():
self.page = self.page.getRedirectTarget()
def handle_edit_conflict(self, new):
+ """When an edit conflict occures save the new text to a file."""
fn = os.path.join(tempfile.gettempdir(), self.page.title())
fp = open(fn, 'w')
fp.write(new)
fp.close()
pywikibot.output(
- u"An edit conflict has arisen. Your edit has been saved to %s.
Please try again."
- % fn)
+ "An edit conflict has arisen. Your edit has been saved to %s. "
+ "Please try again." % fn)
def run(self):
+ """Run the bot."""
self.site.login()
try:
old = self.page.get(get_redirect=self.options.edit_redirect)
@@ -101,7 +105,7 @@
new = textEditor.edit(old)
if new and old != new:
pywikibot.showDiff(old, new)
- changes = pywikibot.input(u"What did you change?")
+ changes = pywikibot.input("What did you change?")
comment = i18n.twtranslate(pywikibot.Site(), 'editarticle-edit',
{'description': changes})
try:
@@ -110,7 +114,7 @@
except pywikibot.EditConflict:
self.handle_edit_conflict(new)
else:
- pywikibot.output(u"Nothing changed")
+ pywikibot.output("Nothing changed")
def main(*args):
diff --git a/scripts/noreferences.py b/scripts/noreferences.py
index 1c22bbb..a8f12b6 100755
--- a/scripts/noreferences.py
+++ b/scripts/noreferences.py
@@ -463,6 +463,7 @@
self.referencesR = re.compile('<references.*?/>', re.IGNORECASE)
def __iter__(self):
+ """XML iterator."""
from pywikibot import xmlreader
dump = xmlreader.XmlDump(self.xmlFilename)
for entry in dump.parse():
@@ -636,6 +637,7 @@
return self.createReferenceSection(oldText, index)
def createReferenceSection(self, oldText, index, ident='=='):
+ """Create a reference section and insert it into the given text."""
if self.site.language() in noTitleRequired:
newSection = u'\n%s\n' % (self.referencesText)
else:
@@ -647,7 +649,7 @@
return oldText[:index] + newSection + oldText[index:]
def run(self):
-
+ """Run the bot."""
for page in self.generator:
self.current_page = page
try:
diff --git a/tox.ini b/tox.ini
index e34218b..d78f8df 100644
--- a/tox.ini
+++ b/tox.ini
@@ -78,6 +78,7 @@
scripts/data_ingestion.py \
scripts/delete.py \
scripts/disambredir.py \
+ scripts/editarticle.py \
scripts/fixing_redirects.py \
scripts/flickrripper.py \
scripts/harvest_template.py \
@@ -89,6 +90,7 @@
scripts/login.py \
scripts/maintenance/__init__.py \
scripts/newitem.py \
+ scripts/noreferences.py \
scripts/pagefromfile.py \
scripts/piper.py \
scripts/protect.py \
--
To view, visit https://gerrit.wikimedia.org/r/210930
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I51ce5eb9827af03e491a364f87de5a6744ce1c38
Gerrit-PatchSet: 5
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: John Vandenberg <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: Merlijn van Deen <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
