jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611836 )
Change subject: Update pagefromfile for py3
......................................................................
Update pagefromfile for py3
Bug: T257399
Change-Id: Ifa3ba4bcc667e03b3133517d03fa0dc98dadeb8d
---
M scripts/pagefromfile.py
1 file changed, 14 insertions(+), 16 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/pagefromfile.py b/scripts/pagefromfile.py
index 4a2baa1..537ae7c 100755
--- a/scripts/pagefromfile.py
+++ b/scripts/pagefromfile.py
@@ -61,23 +61,21 @@
can be added between them by specifying '\n' as a value.
"""
#
-# (C) Pywikibot team, 2004-2019
+# (C) Pywikibot team, 2004-2020
#
# Distributed under the terms of the MIT license.
#
-from __future__ import absolute_import, division, unicode_literals
-
import codecs
import os
import re
+from typing import Generator, Tuple
from warnings import warn
import pywikibot
from pywikibot import config, i18n
-from pywikibot.bot import SingleSiteBot, CurrentPageBot
-from pywikibot.bot import OptionHandler
+from pywikibot.bot import CurrentPageBot, OptionHandler, SingleSiteBot
from pywikibot.exceptions import ArgumentDeprecationWarning
@@ -99,7 +97,7 @@
"""
- def __init__(self, **kwargs):
+ def __init__(self, **kwargs) -> None:
"""Initializer."""
self.availableOptions.update({
'always': True,
@@ -113,18 +111,18 @@
'showdiff': False,
})
- super(PageFromFileRobot, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.availableOptions.update(
- {'always': False if self.getOption('showdiff') else True})
+ {'always': not self.getOption('showdiff')})
- def init_page(self, item):
+ def init_page(self, item) -> pywikibot.Page:
"""Get the tuple and return the page object to be processed."""
title, content = item
page = pywikibot.Page(self.site, title)
page.text = content.strip()
- return super(PageFromFileRobot, self).init_page(page)
+ return super().init_page(page)
- def treat_page(self):
+ def treat_page(self) -> None:
"""Upload page content."""
page = self.current_page
title = page.title()
@@ -208,14 +206,14 @@
'title': None,
}
- def __init__(self, filename, **kwargs):
+ def __init__(self, filename, **kwargs) -> None:
"""Initializer.
Check if self.file name exists. If not, ask for a new filename.
User can quit.
"""
- super(PageFromFileReader, self).__init__(**kwargs)
+ super().__init__(**kwargs)
self.filename = filename
self.pageStartMarker = self.getOption('begin')
self.pageEndMarker = self.getOption('end')
@@ -224,7 +222,7 @@
self.include = self.getOption('include')
self.notitle = self.getOption('notitle')
- def __iter__(self):
+ def __iter__(self) -> Generator[Tuple[str, str], None, None]:
"""Read file and yield a tuple of page title and content."""
pywikibot.output("\n\nReading '{0}'...".format(self.filename))
try:
@@ -256,7 +254,7 @@
position += length
yield title, contents
- def findpage(self, text):
+ def findpage(self, text) -> Tuple[int, str, str]:
"""Find page to work on."""
if self.getOption('textonly'):
pattern = '^(.*)$'
@@ -286,7 +284,7 @@
return location.end(), title, contents
-def main(*args):
+def main(*args) -> None:
"""
Process command line arguments and invoke bot.
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/611836
To unsubscribe, or for help writing mail filters, visit
https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: Ifa3ba4bcc667e03b3133517d03fa0dc98dadeb8d
Gerrit-Change-Number: 611836
Gerrit-PatchSet: 2
Gerrit-Owner: JJMC89 <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
