Pywikibot-commits July 2020

pywikibot-commits@lists.wikimedia.org

1 participants
180 discussions

[Gerrit] ...core[master]: [bugfix] After UnicodeMixin has been dropped, remove the related test

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616698 ) Change subject: [bugfix] After UnicodeMixin has been dropped, remove the related test ...................................................................... [bugfix] After UnicodeMixin has been dropped, remove the related test Bug: T258998 Change-Id: Ieab690d22e2ca94c8f9644f968692e981c328e92 --- M tests/djvu_tests.py 1 file changed, 0 insertions(+), 6 deletions(-) Approvals: Matěj Suchánek: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/djvu_tests.py b/tests/djvu_tests.py index ecba137..5f8b658 100644 --- a/tests/djvu_tests.py +++ b/tests/djvu_tests.py @@ -55,12 +55,6 @@ expected = "DjVuFile('{}')".format(self.file_djvu) self.assertEqual(str(djvu), expected) - def test_unicode_method(self): - """Test __unicode__() method.""" - djvu = DjVuFile(self.file_djvu) - expected = "DjVuFile('{}')".format(self.file_djvu) - self.assertEqual(djvu.__unicode__(), expected) - def test_file_existence(self): """Test file existence checks.""" djvu = DjVuFile(self.file_djvu) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616698 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: Ieab690d22e2ca94c8f9644f968692e981c328e92 Gerrit-Change-Number: 616698 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-CC: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-CC: Huji <huji.huji(a)gmail.com> Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [bugfix] Fix ShouldArchive type

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616546 ) Change subject: [bugfix] Fix ShouldArchive type ...................................................................... [bugfix] Fix ShouldArchive type We never put None to whys in PageArchiver, so remove optional from the declaration and use it explicitly. Change-Id: I6180e4fdfc65a0d845f5788c327595a9201a3b31 --- M scripts/archivebot.py 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archivebot.py b/scripts/archivebot.py index b8c81e0..eda4978 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -115,7 +115,7 @@ from pywikibot.tools import issue_deprecation_warning, FrozenDict, deprecated -ShouldArchive = Optional[Tuple[str, str]] +ShouldArchive = Tuple[str, str] Size = Tuple[int, str] ZERO = datetime.timedelta(0) @@ -389,7 +389,7 @@ @deprecated('PageArchiver.should_archive_thread(thread)', since='20200727', future_warning=True) - def should_be_archived(self, archiver) -> ShouldArchive: + def should_be_archived(self, archiver) -> Optional[ShouldArchive]: """Check whether thread has to be archived.""" return archiver.should_archive_thread(self) @@ -589,7 +589,7 @@ if not self.get_attr('archive', ''): raise MissingConfigError('Missing argument "archive" in template') - def should_archive_thread(self, thread) -> ShouldArchive: + def should_archive_thread(self, thread) -> Optional[ShouldArchive]: """ Check whether a thread has to be archived. -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616546 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: I6180e4fdfc65a0d845f5788c327595a9201a3b31 Gerrit-Change-Number: 616546 Gerrit-PatchSet: 2 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [IMPR] Refactor PageArchiver's main loop

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616543 ) Change subject: [IMPR] Refactor PageArchiver's main loop ...................................................................... [IMPR] Refactor PageArchiver's main loop - Avoid archiving to full archives. Previously the bot wouldn't check this. Create, split or deprecate methods where needed. - However, only bother checking if the archivation depends on the counter. Otherwise just archive the thread. - Improve typehints. Change-Id: I5095d0811014ffbf56da37f1fa767931217b5317 --- M scripts/archivebot.py 1 file changed, 77 insertions(+), 43 deletions(-) Approvals: jenkins-bot: Verified Xqt: Looks good to me, approved diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 7698709..b8c81e0 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -116,6 +116,7 @@ ShouldArchive = Optional[Tuple[str, str]] +Size = Tuple[int, str] ZERO = datetime.timedelta(0) @@ -245,7 +246,7 @@ return key, duration -def str2size(string) -> Tuple[int, str]: +def str2size(string) -> Size: """ Return a size for a shorthand size. @@ -371,7 +372,14 @@ self.timestamp = max(self.timestamp, timestamp) def size(self) -> int: - """Return size of discussion thread.""" + """ + Return size of discussion thread. + + Note that the result is NOT equal to that of + len(self.to_text()). This method counts bytes, rather than + codepoints (characters). This corresponds to MediaWiki's + definition of page size. + """ return len(self.title.encode('utf-8')) + len( self.content.encode('utf-8')) + 12 @@ -455,18 +463,23 @@ pywikibot.output('{} thread(s) found on {}' .format(len(self.threads), self)) - def feed_thread(self, thread, max_archive_size=(250 * 1024, 'B')) -> bool: + def is_full(self, max_archive_size=(250 * 1024, 'B')) -> bool: """Check whether archive size exceeded.""" - self.threads.append(thread) - self.archived_threads += 1 if max_archive_size[1] == 'B': if self.size() >= max_archive_size[0]: - self.full = True + self.full = True # xxx: this is one-way flag elif max_archive_size[1] == 'T': if len(self.threads) >= max_archive_size[0]: self.full = True return self.full + def feed_thread(self, thread: DiscussionThread, + max_archive_size=(250 * 1024, 'B')) -> bool: + """Append a new thread to the archive.""" + self.threads.append(thread) + self.archived_threads += 1 + return self.is_full(max_archive_size) + def size(self) -> int: """Return size of talk page threads.""" return len(self.header.encode('utf-8')) + sum(t.size() @@ -596,16 +609,15 @@ # TODO: handle marked with template return None - def feed_archive(self, archive, thread, max_archive_size, params=None - ) -> bool: + def get_archive_page(self, title: str, params=None) -> DiscussionPage: """ - Feed the thread to one of the archives. + Return the page for archiving. - If it doesn't exist yet, create it. + If it doesn't exist yet, create and cache it. Also check for security violations. """ - title = archive.title() page_title = self.page.title() + archive = pywikibot.Page(self.site, title) if not (self.force or title.startswith(page_title + '/') or self.key_ok()): raise ArchiveSecurityError( @@ -613,12 +625,45 @@ .format(archive, page_title)) if title not in self.archives: self.archives[title] = DiscussionPage(archive, self, params) - return self.archives[title].feed_thread(thread, max_archive_size) + return self.archives[title] + + @deprecated(since='20200727', future_warning=True) + def feed_archive(self, archive: pywikibot.Page, thread: DiscussionThread, + max_archive_size: Size, params=None) -> bool: + """ + Feed the thread to one of the archives. + + Also check for security violations. + + @return: whether the archive is full + """ + archive_page = self.get_archive_page( + archive.title(with_ns=True), params) + return archive_page.feed_thread(thread, max_archive_size) + + def get_params(self, timestamp, counter: int) -> dict: + """Make params for archiving template.""" + lang = self.site.lang + return { + 'counter': to_local_digits(counter, lang), + 'year': to_local_digits(timestamp.year, lang), + 'isoyear': to_local_digits(timestamp.isocalendar()[0], lang), + 'isoweek': to_local_digits(timestamp.isocalendar()[1], lang), + 'semester': to_local_digits(int(ceil(timestamp.month / 6)), lang), + 'quarter': to_local_digits(int(ceil(timestamp.month / 3)), lang), + 'month': to_local_digits(timestamp.month, lang), + 'monthname': self.month_num2orig_names[timestamp.month]['long'], + 'monthnameshort': self.month_num2orig_names[ + timestamp.month]['short'], + 'week': to_local_digits( + int(time.strftime('%W', timestamp.timetuple())), lang), + } def analyze_page(self) -> Set[ShouldArchive]: """Analyze DiscussionPage.""" max_arch_size = str2size(self.get_attr('maxarchivesize')) - arch_counter = int(self.get_attr('counter', '1')) + counter = int(self.get_attr('counter', '1')) + pattern = self.get_attr('archive') oldthreads = self.page.threads self.page.threads = [] whys = set() @@ -631,37 +676,26 @@ # TODO: Make an option so that unstamped (unsigned) posts get # archived. why = self.should_archive_thread(thread) - if why: - archive = self.get_attr('archive') - lang = self.site.lang - timestamp = thread.timestamp - params = { - 'counter': to_local_digits(arch_counter, lang), - 'year': to_local_digits(timestamp.year, lang), - 'isoyear': to_local_digits(timestamp.isocalendar()[0], - lang), - 'isoweek': to_local_digits(timestamp.isocalendar()[1], - lang), - 'semester': to_local_digits(int(ceil(timestamp.month / 6)), - lang), - 'quarter': to_local_digits(int(ceil(timestamp.month / 3)), - lang), - 'month': to_local_digits(timestamp.month, lang), - 'monthname': self.month_num2orig_names[ - timestamp.month]['long'], - 'monthnameshort': self.month_num2orig_names[ - timestamp.month]['short'], - 'week': to_local_digits( - int(time.strftime('%W', timestamp.timetuple())), lang), - } - archive = pywikibot.Page(self.site, archive % params) - if self.feed_archive(archive, thread, max_arch_size, params): - arch_counter += 1 - self.set_attr('counter', str(arch_counter)) - whys.add(why) - self.archived_threads += 1 - else: + if not why or why[0] != 'duration': self.page.threads.append(thread) + continue + + params = self.get_params(thread.timestamp, counter) + archive = self.get_archive_page(pattern % params, params) + + aux_params = self.get_params(thread.timestamp, counter + 1) + counter_matters = (pattern % params) != (pattern % aux_params) + del aux_params + while counter_matters and archive.is_full(max_arch_size): + counter += 1 + params = self.get_params(thread.timestamp, counter) + archive = self.get_archive_page(pattern % params, params) + + archive.feed_thread(thread, max_arch_size) + whys.add(why) + self.archived_threads += 1 + + self.set_attr('counter', str(counter)) return whys def run(self) -> None: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616543 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: I5095d0811014ffbf56da37f1fa767931217b5317 Gerrit-Change-Number: 616543 Gerrit-PatchSet: 6 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [IMPR] Move archiving logic to PageArchiver

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616525 ) Change subject: [IMPR] Move archiving logic to PageArchiver ...................................................................... [IMPR] Move archiving logic to PageArchiver This avoids circular dependency between DiscussionThread and PageArchiver. Deprecate obsolete code paths. Also make change the parsing method to re.fullmatch to be more strict about the value. Change-Id: I311a3e4ba5b88f2376681d1716e1371950319915 --- M scripts/archivebot.py M tests/archivebot_tests.py 2 files changed, 36 insertions(+), 29 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 674160b..7698709 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -112,7 +112,7 @@ from pywikibot import i18n from pywikibot.textlib import (extract_sections, findmarker, TimeStripper, to_local_digits) -from pywikibot.tools import issue_deprecation_warning, FrozenDict +from pywikibot.tools import issue_deprecation_warning, FrozenDict, deprecated ShouldArchive = Optional[Tuple[str, str]] @@ -337,10 +337,15 @@ :Reply, etc. ~~~~ """ - def __init__(self, title, now, timestripper) -> None: + def __init__(self, title, _now=None, timestripper=None) -> None: """Initializer.""" + if _now is not None: + issue_deprecation_warning( + 'Argument "now" in DiscussionThread.__init__()', + warning_class=FutureWarning, + since='20200727') + assert timestripper is not None self.title = title - self.now = now self.ts = timestripper self.code = self.ts.site.code self.content = '' @@ -374,25 +379,11 @@ """Return wikitext discussion thread.""" return '== {} ==\n\n{}'.format(self.title, self.content) + @deprecated('PageArchiver.should_archive_thread(thread)', since='20200727', + future_warning=True) def should_be_archived(self, archiver) -> ShouldArchive: - """ - Check whether thread has to be archived. - - @return: the archivation reason as a tuple of localization args - """ - # Archived by timestamp - algo = archiver.get_attr('algo') - re_t = re.search(r'^old$(.*)$$', algo) - if re_t: - if not self.timestamp: - return None - # TODO: handle unsigned - maxage = str2time(re_t.group(1), self.timestamp) - if self.now - self.timestamp > maxage: - duration = str2localized_duration(archiver.site, re_t.group(1)) - return ('duration', duration) - # TODO: handle marked with template - return None + """Check whether thread has to be archived.""" + return archiver.should_archive_thread(self) class DiscussionPage(pywikibot.Page): @@ -419,7 +410,6 @@ else: self.timestripper = self.archiver.timestripper self.params = params - self.now = datetime.datetime.utcnow().replace(tzinfo=TZoneUTC()) try: self.load_page() except pywikibot.NoPage: @@ -451,8 +441,8 @@ else: self.header = header + footer for thread_heading, thread_content in threads: - cur_thread = DiscussionThread(thread_heading.strip('= '), self.now, - self.timestripper) + cur_thread = DiscussionThread( + thread_heading.strip('= '), timestripper=self.timestripper) lines = thread_content.replace(marker, '').splitlines() lines = lines[1:] # remove heading line for line in lines: @@ -531,6 +521,7 @@ self.comment_params = { 'from': self.page.title(), } + self.now = datetime.datetime.utcnow().replace(tzinfo=TZoneUTC()) self.archives = {} self.archived_threads = 0 self.month_num2orig_names = {} @@ -585,6 +576,26 @@ if not self.get_attr('archive', ''): raise MissingConfigError('Missing argument "archive" in template') + def should_archive_thread(self, thread) -> ShouldArchive: + """ + Check whether a thread has to be archived. + + @return: the archivation reason as a tuple of localization args + """ + # Archived by timestamp + algo = self.get_attr('algo') + re_t = re.fullmatch(r'old$(.*)$', algo) + if re_t: + if not thread.timestamp: + return None + # TODO: handle unsigned + maxage = str2time(re_t.group(1), thread.timestamp) + if self.now - thread.timestamp > maxage: + duration = str2localized_duration(self.site, re_t.group(1)) + return ('duration', duration) + # TODO: handle marked with template + return None + def feed_archive(self, archive, thread, max_archive_size, params=None ) -> bool: """ @@ -619,7 +630,7 @@ continue # Because there's too little threads left. # TODO: Make an option so that unstamped (unsigned) posts get # archived. - why = thread.should_be_archived(self) + why = self.should_archive_thread(thread) if why: archive = self.get_attr('archive') lang = self.site.lang diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index e01f524..ec63a06 100644 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -164,8 +164,6 @@ for thread in talk.threads: self.assertIsInstance(thread, archivebot.DiscussionThread) self.assertIsInstance(thread.title, str) - self.assertIsInstance(thread.now, datetime) - self.assertEqual(thread.now, talk.now) self.assertIsInstance(thread.ts, TimeStripper) self.assertEqual(thread.ts, talk.timestripper) self.assertIsInstance(thread.code, str) @@ -230,8 +228,6 @@ for thread in talk.threads: self.assertIsInstance(thread, archivebot.DiscussionThread) self.assertIsInstance(thread.title, str) - self.assertIsInstance(thread.now, datetime) - self.assertEqual(thread.now, talk.now) self.assertIsInstance(thread.ts, TimeStripper) self.assertEqual(thread.ts, talk.timestripper) self.assertIsInstance(thread.code, str) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616525 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: I311a3e4ba5b88f2376681d1716e1371950319915 Gerrit-Change-Number: 616525 Gerrit-PatchSet: 4 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...i18n[master]: Localisation updates from https://translatewiki.net.

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/616550 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: Ia30b03756312c1c58b1cc7210cbdbd3e8166b19e --- M category/yue.json M category_redirect/zh.json A checkimages/yue.json A delete/yue.json A movepages/yue.json A weblinkchecker/yue.json M welcome/fi.json 7 files changed, 52 insertions(+), 3 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/yue.json b/category/yue.json index 7f0b1e5..cd8a2db 100644 --- a/category/yue.json +++ b/category/yue.json @@ -1,8 +1,11 @@ { "@metadata": { "authors": [ + "Moon0319", "Xqt" ] }, - "category-adding": "機械人: 加 category [[:Category:%(newcat)s|%(newcat)s]]" + "category-adding": "機械人: 加 category [[:Category:%(newcat)s|%(newcat)s]]", + "category-was-disbanded": "機械人:類經已冇咗。", + "category-was-moved": "機械人:類經已畀人搬咗去[[:Category:%(newcat)s|%(title)s]]" } diff --git a/category_redirect/zh.json b/category_redirect/zh.json index 75572e8..12600b1 100644 --- a/category_redirect/zh.json +++ b/category_redirect/zh.json @@ -4,6 +4,7 @@ "Liangent", "Liuxinyu970226", "VulpesVulpes825", + "XinuGod", "Yfdyh000" ] }, @@ -15,7 +16,18 @@ "category_redirect-fix-double": "机器人：修正双重重定向", "category_redirect-log-added": "* 已添加[[%(ns)s%(template)s]]至%(oldcat)s", "category_redirect-log-add-failed": "* 未能将[[%(ns)s%(template)s]]添加至%(oldcat)s", + "category_redirect-log-double": "*修复双重重定向：%(oldcat)s->%(newcat)s->%(targetcat)s", "category_redirect-log-failed": "** 失败: %(error)s", + "category_redirect-log-false-positive": "*出乎意料的非重定向：%(oldcat)s", "category_redirect-log-ignoring": "*无视 %(oldcat)s中", - "category_redirect-problem-redirects": "# %(oldcat)s重定向至%(redpage)s" + "category_redirect-log-loop": "*从%(oldcat)s循环重定向", + "category_redirect-log-moved": "*%(oldcat)s：%(found)d被发现，%(moved)d已移动", + "category_redirect-log-move-error": "*%(oldcat)s：移动内容错误", + "category_redirect-log-new": "从上次报告以来的新重定向：", + "category_redirect-log-not-loaded": "*无法加载%(oldcat)s；忽略", + "category_redirect-log-skipping": "*略过%(oldcat)s；在冷却期间", + "category_redirect-older-logs": "'''[%(oldlogs)s 旧的日志]'''", + "category_redirect-problem-hard": "#%(oldcat)s很难重定向到%(page)s", + "category_redirect-problem-redirects": "# %(oldcat)s重定向至%(redpage)s", + "category_redirect-problem-self-linked": "#%(oldcat)s是一个自我链接重定向。" } diff --git a/checkimages/yue.json b/checkimages/yue.json new file mode 100644 index 0000000..b3ca261 --- /dev/null +++ b/checkimages/yue.json @@ -0,0 +1,9 @@ +{ + "@metadata": { + "authors": [ + "Moon0319" + ] + }, + "checkimages-log-comment": "機械人: 更新日誌", + "checkimages-no-license-head": "冇拉臣嘅相" +} diff --git a/delete/yue.json b/delete/yue.json new file mode 100644 index 0000000..2d7cce8 --- /dev/null +++ b/delete/yue.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Moon0319" + ] + }, + "delete-from-file": "機械人:剷一啲版。" +} diff --git a/movepages/yue.json b/movepages/yue.json new file mode 100644 index 0000000..bf87de5 --- /dev/null +++ b/movepages/yue.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Moon0319" + ] + }, + "movepages-moving": "機械人:搬版" +} diff --git a/weblinkchecker/yue.json b/weblinkchecker/yue.json new file mode 100644 index 0000000..28cf1f7 --- /dev/null +++ b/weblinkchecker/yue.json @@ -0,0 +1,8 @@ +{ + "@metadata": { + "authors": [ + "Moon0319" + ] + }, + "weblinkchecker-caption": "死拎" +} diff --git a/welcome/fi.json b/welcome/fi.json index d36370f..2f2734f 100644 --- a/welcome/fi.json +++ b/welcome/fi.json @@ -1,11 +1,12 @@ { "@metadata": { "authors": [ + "01miki10", "Crt", "Olli" ] }, - "welcome-bad_username": "Botti: Lisätään käyttäjätunnus, joka pitää tarkistaa", + "welcome-bad_username": "Botti: Lisätään käyttäjänimi, joka pitää tarkistaa", "welcome-updating": "Botti päivitti lokia", "welcome-welcome": "Tervetuloa!" } -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/616550 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-Change-Id: Ia30b03756312c1c58b1cc7210cbdbd3e8166b19e Gerrit-Change-Number: 616550 Gerrit-PatchSet: 1 Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [cleanup] Remove outdated Python 2.6 backports from tools

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616219 ) Change subject: [cleanup] Remove outdated Python 2.6 backports from tools ...................................................................... [cleanup] Remove outdated Python 2.6 backports from tools Bug: T106121 Change-Id: I539b7c82973bd58f6a53949217a20b4500b90331 --- M pywikibot/tools/__init__.py 1 file changed, 0 insertions(+), 50 deletions(-) Approvals: D3r1ck01: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 174ce85..00735a3 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -1833,48 +1833,6 @@ # deprecated parts ############################################################ -class ContextManagerWrapper: - - """ - DEPRECATED. Wraps an object in a context manager. - - It is redirecting all access to the wrapped object and executes 'close' - when used as a context manager in with-statements. In such statements the - value set via 'as' is directly the wrapped object. For example: - - >>> class Wrapper: - ... def close(self): pass - >>> an_object = Wrapper() - >>> wrapped = ContextManagerWrapper(an_object) - >>> with wrapped as another_object: - ... assert another_object is an_object - - It does not subclass the object though, so isinstance checks will fail - outside a with-statement. - """ - - def __init__(self, wrapped): - """Create a new wrapper.""" - super().__init__() - super().__setattr__('_wrapped', wrapped) - - def __enter__(self): - """Enter a context manager and use the wrapped object directly.""" - return self._wrapped - - def __exit__(self, exc_type, exc_value, traceback): - """Call close on the wrapped object when exiting a context manager.""" - self._wrapped.close() - - def __getattr__(self, name): - """Get the attribute from the wrapped object.""" - return getattr(self._wrapped, name) - - def __setattr__(self, name, value): - """Set the attribute in the wrapped object.""" - setattr(self._wrapped, name, value) - - class IteratorNextMixin(Iterator): """DEPRECATED. Backwards compatibility for Iterators.""" @@ -1922,14 +1880,6 @@ wrapper = ModuleDeprecationWrapper(__name__) -wrapper._add_deprecated_attr('Counter', collections.Counter, since='20160111', - future_warning=True) -wrapper._add_deprecated_attr('OrderedDict', collections.OrderedDict, - since='20160111', future_warning=True) -wrapper._add_deprecated_attr('count', itertools.count, since='20160111', - future_warning=True) -wrapper._add_deprecated_attr('ContextManagerWrapper', replacement_name='', - since='20180402', future_warning=True) wrapper._add_deprecated_attr('UnicodeMixin', _UnicodeMixin, replacement_name='', since='20200723', future_warning=True) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616219 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: I539b7c82973bd58f6a53949217a20b4500b90331 Gerrit-Change-Number: 616219 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [bugfix] Fix str2size to allow space separators

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616514 ) Change subject: [bugfix] Fix str2size to allow space separators ...................................................................... [bugfix] Fix str2size to allow space separators Concurrently, use re.fullmatch (Python 3.4) to make it stricter about the input. Better safe than sorry. Also improve test coverage. Change-Id: I8c17129ea5604d1038720704447966c732d010ba --- M scripts/archivebot.py M tests/archivebot_tests.py 2 files changed, 18 insertions(+), 4 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archivebot.py b/scripts/archivebot.py index e64c4db..674160b 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -256,10 +256,10 @@ Returns a tuple (size,unit), where size is an integer and unit is 'B' (bytes) or 'T' (threads). """ - match = re.search(r'(\d+) *([BkKMT]?)', string) + match = re.fullmatch(r'(\d{1,3}(?: \d{3})+|\d+) *([BkKMT]?)', string) if not match: raise MalformedConfigError("Couldn't parse size: {}".format(string)) - val, unit = (int(match.group(1)), match.group(2)) + val, unit = (int(match.group(1).replace(' ', '')), match.group(2)) if unit == 'M': val *= 1024 unit = 'K' diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index 32ffc39..e01f524 100644 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -114,8 +114,22 @@ self.assertEqual(archivebot.str2size('4 K'), (4096, 'B')) self.assertEqual(archivebot.str2size('1 M'), (1048576, 'B')) self.assertEqual(archivebot.str2size('2T'), (2, 'T')) - # TODO: should probably be recognized 2000? - self.assertEqual(archivebot.str2size('2 000'), (2, 'B')) + self.assertEqual(archivebot.str2size('2 000'), (2000, 'B')) + self.assertEqual(archivebot.str2size('2 000B'), (2000, 'B')) + self.assertEqual(archivebot.str2size('2 000 B'), (2000, 'B')) + + def test_str2size_failures(self): + """Test for rejecting of invalid shorthand notation of sizes.""" + self.assertRaises(archivebot.MalformedConfigError, archivebot.str2size, + '4 KK') + self.assertRaises(archivebot.MalformedConfigError, archivebot.str2size, + 'K4') + self.assertRaises(archivebot.MalformedConfigError, archivebot.str2size, + '4X') + self.assertRaises(archivebot.MalformedConfigError, archivebot.str2size, + '1 234 56') + self.assertRaises(archivebot.MalformedConfigError, archivebot.str2size, + '1234 567') class TestArchiveBot(TestCase): -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616514 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: I8c17129ea5604d1038720704447966c732d010ba Gerrit-Change-Number: 616514 Gerrit-PatchSet: 1 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [IMPR] Cleanup archivebot.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616512 ) Change subject: [IMPR] Cleanup archivebot.py ...................................................................... [IMPR] Cleanup archivebot.py - rename single-character variables for clarity - drop redundant casting to float - make use enumerate's start argument - and more This is the first refactoring step to allow for easier solving current feature requests. Change-Id: Id2026fa0ae296bb1d6ea7acab8994b7c6bf186a9 --- M scripts/archivebot.py 1 file changed, 25 insertions(+), 25 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/archivebot.py b/scripts/archivebot.py index 9e9adcb..e64c4db 100755 --- a/scripts/archivebot.py +++ b/scripts/archivebot.py @@ -233,7 +233,6 @@ @type string: str @return: key and duration extracted form the string """ - key = string[-1] if string.isdigit(): key = 's' duration = string @@ -241,6 +240,7 @@ string + key, 1, UserWarning, since='20161009') else: + key = string[-1] duration = string[:-1] return key, duration @@ -256,10 +256,10 @@ Returns a tuple (size,unit), where size is an integer and unit is 'B' (bytes) or 'T' (threads). """ - r = re.search(r'(\d+) *([BkKMT]?)', string) - if not r: + match = re.search(r'(\d+) *([BkKMT]?)', string) + if not match: raise MalformedConfigError("Couldn't parse size: {}".format(string)) - val, unit = (int(r.group(1)), r.group(2)) + val, unit = (int(match.group(1)), match.group(2)) if unit == 'M': val *= 1024 unit = 'K' @@ -534,8 +534,8 @@ self.archives = {} self.archived_threads = 0 self.month_num2orig_names = {} - for n, (_long, _short) in enumerate(self.site.months_names): - self.month_num2orig_names[n + 1] = {'long': _long, 'short': _short} + for n, (long, short) in enumerate(self.site.months_names, start=1): + self.month_num2orig_names[n] = {'long': long, 'short': short} def get_attr(self, attr, default='') -> Any: """Get an archiver attribute.""" @@ -612,45 +612,45 @@ self.page.threads = [] whys = set() pywikibot.output('Processing {} threads'.format(len(oldthreads))) - for t in oldthreads: - if len(oldthreads) - self.archived_threads \ - <= int(self.get_attr('minthreadsleft', 5)): - self.page.threads.append(t) + for thread in oldthreads: + threads_left = len(oldthreads) - self.archived_threads + if threads_left <= int(self.get_attr('minthreadsleft', 5)): + self.page.threads.append(thread) continue # Because there's too little threads left. # TODO: Make an option so that unstamped (unsigned) posts get # archived. - why = t.should_be_archived(self) + why = thread.should_be_archived(self) if why: archive = self.get_attr('archive') lang = self.site.lang + timestamp = thread.timestamp params = { 'counter': to_local_digits(arch_counter, lang), - 'year': to_local_digits(t.timestamp.year, lang), - 'isoyear': to_local_digits(t.timestamp.isocalendar()[0], + 'year': to_local_digits(timestamp.year, lang), + 'isoyear': to_local_digits(timestamp.isocalendar()[0], lang), - 'isoweek': to_local_digits(t.timestamp.isocalendar()[1], + 'isoweek': to_local_digits(timestamp.isocalendar()[1], lang), - 'semester': to_local_digits( - int(ceil(float(t.timestamp.month) / 6)), lang), - 'quarter': to_local_digits( - int(ceil(float(t.timestamp.month) / 3)), lang), - 'month': to_local_digits(t.timestamp.month, lang), + 'semester': to_local_digits(int(ceil(timestamp.month / 6)), + lang), + 'quarter': to_local_digits(int(ceil(timestamp.month / 3)), + lang), + 'month': to_local_digits(timestamp.month, lang), 'monthname': self.month_num2orig_names[ - t.timestamp.month]['long'], + timestamp.month]['long'], 'monthnameshort': self.month_num2orig_names[ - t.timestamp.month]['short'], + timestamp.month]['short'], 'week': to_local_digits( - int(time.strftime('%W', - t.timestamp.timetuple())), lang), + int(time.strftime('%W', timestamp.timetuple())), lang), } archive = pywikibot.Page(self.site, archive % params) - if self.feed_archive(archive, t, max_arch_size, params): + if self.feed_archive(archive, thread, max_arch_size, params): arch_counter += 1 self.set_attr('counter', str(arch_counter)) whys.add(why) self.archived_threads += 1 else: - self.page.threads.append(t) + self.page.threads.append(thread) return whys def run(self) -> None: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616512 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: Id2026fa0ae296bb1d6ea7acab8994b7c6bf186a9 Gerrit-Change-Number: 616512 Gerrit-PatchSet: 2 Gerrit-Owner: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [4.0] replace StringTypes with str in several scripts

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616047 ) Change subject: [4.0] replace StringTypes with str in several scripts ...................................................................... [4.0] replace StringTypes with str in several scripts Change-Id: Ia3c8607bf13962d7ffcb169cf8963bee30e02e6d --- M pywikibot/i18n.py M pywikibot/textlib.py M pywikibot/tools/djvu.py M tests/archivebot_tests.py M tests/compat2core_tests.py M tests/family_tests.py M tests/i18n_tests.py M tests/user_tests.py 8 files changed, 79 insertions(+), 130 deletions(-) Approvals: D3r1ck01: Looks good to me, but someone else must approve Zhuyifei1999: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/i18n.py b/pywikibot/i18n.py index cff155a..9779f83 100644 --- a/pywikibot/i18n.py +++ b/pywikibot/i18n.py @@ -21,18 +21,13 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import json import os import pkgutil import re +from collections.abc import Mapping from collections import defaultdict -try: - from collections.abc import Mapping -except ImportError: # Python 2.7 - from collections import Mapping from textwrap import fill from warnings import warn @@ -43,7 +38,7 @@ from pywikibot.exceptions import Error from pywikibot.plural import plural_rules from pywikibot.tools import ( - deprecated, deprecated_args, issue_deprecation_warning, StringTypes) + deprecated, deprecated_args, issue_deprecation_warning) PLURAL_PATTERN = r'{{PLURAL:(?:%$)?([^$]*?)(?:\)d)?\|(.*?)}}' @@ -526,9 +521,10 @@ """ def __init__(self, source): - if isinstance(source, StringTypes): - source = int(source) - self.source = source + if isinstance(source, str): + self.source = int(source) + else: + self.source = source self.index = -1 super(_PluralMappingAlias, self).__init__() @@ -536,13 +532,13 @@ self.index += 1 if isinstance(self.source, dict): return int(self.source[key]) - elif isinstance(self.source, (tuple, list)): + + if isinstance(self.source, (tuple, list)): if self.index < len(self.source): return int(self.source[self.index]) raise ValueError('Length of parameter does not match PLURAL ' 'occurrences.') - else: - return self.source + return self.source def __iter__(self): raise NotImplementedError diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 9c74eb2..dfd8486 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -11,12 +11,12 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - import datetime import re +from collections.abc import Sequence from collections import OrderedDict, namedtuple +from html.parser import HTMLParser import pywikibot from pywikibot.exceptions import InvalidTitle, SiteDefinitionError @@ -25,20 +25,9 @@ deprecate_arg, deprecated, DeprecatedRegex, - StringTypes, - UnicodeType, issue_deprecation_warning, - PY2, ) -if not PY2: - from collections.abc import Sequence - from html.parser import HTMLParser -else: - from collections import Sequence - from future_builtins import zip - from HTMLParser import HTMLParser - try: import mwparserfromhell except ImportError as e: @@ -203,7 +192,7 @@ else: raise ValueError( '{0} is not a template Page object'.format(template)) - elif isinstance(template, StringTypes): + elif isinstance(template, str): old = template else: raise ValueError( @@ -311,7 +300,7 @@ result = [] for exc in keys: - if isinstance(exc, UnicodeType): + if isinstance(exc, str): # assume the string is a reference to a standard regex above, # which may not yet have a site specific re compiled. if exc in _regex_cache: @@ -373,11 +362,8 @@ @type count: int """ # if we got a string, compile it as a regular expression - if isinstance(old, UnicodeType): - if caseInsensitive: - old = re.compile(old, re.IGNORECASE | re.UNICODE) - else: - old = re.compile(old) + if isinstance(old, str): + old = re.compile(old, flags=re.IGNORECASE if caseInsensitive else 0) # early termination if not relevant if not old.search(text): @@ -660,7 +646,7 @@ """Return the link from source when it's a Page otherwise itself.""" if isinstance(source, pywikibot.Page): return source._link - elif isinstance(source, UnicodeType): + elif isinstance(source, str): return pywikibot.Link(source, site) else: return source @@ -694,7 +680,7 @@ 'The original value must be either basestring, Link or Page ' 'but is "{0}"'.format(type(replace_list[0]))) if replace_list[1] is not False and replace_list[1] is not None: - if isinstance(replace_list[1], UnicodeType): + if isinstance(replace_list[1], str): replace_list[1] = pywikibot.Page(site, replace_list[1]) check_classes(replace_list[0]) replace = replace_callable @@ -778,10 +764,10 @@ if new_link is False: # unlink - we remove the section if there's any - assert isinstance(new_label, UnicodeType), \ - 'link text must be unicode.' + assert isinstance(new_label, str), \ + 'link text must be str.' new_link = new_label - if isinstance(new_link, UnicodeType): + if isinstance(new_link, str): # Nothing good can come out of the fact that bytes is returned so # force unicode text = text[:start] + new_link + text[end:] @@ -1550,7 +1536,7 @@ catLinks = [] for category in categories: - if isinstance(category, UnicodeType): + if isinstance(category, str): category, separator, sortKey = category.strip('[]').partition('|') sortKey = sortKey if separator else None # whole word if no ":" is present @@ -1698,14 +1684,14 @@ if not implicit_parameter: value = param.value.strip() else: - value = UnicodeType(param.value) + value = str(param.value) else: - key = UnicodeType(param.name) - value = UnicodeType(param.value) + key = str(param.name) + value = str(param.value) params[key] = value - result.append((UnicodeType(template.name.strip()), params)) + result.append((template.name.strip(), params)) return result @@ -1831,7 +1817,7 @@ param_name, param_val = param.split('=', 1) implicit_parameter = False else: - param_name = UnicodeType(numbered_param) + param_name = str(numbered_param) param_val = param numbered_param += 1 implicit_parameter = True diff --git a/pywikibot/tools/djvu.py b/pywikibot/tools/djvu.py index 8f375ea..cf9f254 100644 --- a/pywikibot/tools/djvu.py +++ b/pywikibot/tools/djvu.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- """Wrapper around djvulibre to access djvu files properties and content.""" # -# (C) Pywikibot team, 2015-2019 +# (C) Pywikibot team, 2015-2020 # # Distributed under the terms of the MIT license. # @@ -15,11 +15,7 @@ import pywikibot -from pywikibot.tools import ( - deprecated, deprecated_args, - StringTypes, - UnicodeType, -) +from pywikibot.tools import deprecated, deprecated_args def _call_cmd(args, lib='djvulibre'): @@ -27,7 +23,7 @@ Tiny wrapper around subprocess.Popen(). @param args: same as Popen() - @type args: typing.Sequence[string] + @type args: str or typing.Sequence[string] @param library: library to be logged in logging messages @type library: str @@ -39,10 +35,9 @@ @return: returns a tuple (res, stdoutdata), where res is True if dp.returncode != 0 else False """ - if not isinstance(args, StringTypes): - # upcast if any param in sequence args is not in StringTypes - args = [str(a) if not isinstance(a, StringTypes) else a for a in args] - cmd = ' '.join(args) + if not isinstance(args, str): + # upcast any param in sequence args to str + cmd = ' '.join(str(a) for a in args) else: cmd = args @@ -59,7 +54,7 @@ return (True, stdoutdata) -class DjVuFile(object): +class DjVuFile: """Wrapper around djvulibre to access djvu files properties and content. @@ -72,12 +67,11 @@ """ @deprecated_args(file_djvu='file') - def __init__(self, file): + def __init__(self, file: str): """ Initializer. @param file: filename (including path) to djvu file - @type file: str """ self._filename = file filename = os.path.expanduser(file) @@ -93,28 +87,15 @@ self._pat_info = re.compile( r'DjVu.*?(?P<size>\d+x\d+).*?(?P<dpi>\d+) dpi') - def __repr__(self): + def __repr__(self) -> str: """Return a more complete string representation.""" - filename = self._filename - if not isinstance(filename, str): - filename = self._filename.encode('utf-8') return str("{0}.{1}('{2}')").format(self.__module__, self.__class__.__name__, - filename) + self._filename) - def __str__(self): + def __str__(self) -> str: """Return a string representation.""" - filename = self._filename - if not isinstance(filename, str): - filename = self._filename.encode('utf-8') - return str("{0}('{1}')").format(self.__class__.__name__, filename) - - def __unicode__(self): - """Return a unicode representation.""" - _str = self.__str__() - if not isinstance(_str, UnicodeType): - _str = _str.decode('utf-8') - return _str + return str("{}('{}')").format(self.__class__.__name__, self._filename) @property @deprecated('DjVuFile.file', since='2010222', future_warning=True) diff --git a/tests/archivebot_tests.py b/tests/archivebot_tests.py index c8b5bc3..32ffc39 100644 --- a/tests/archivebot_tests.py +++ b/tests/archivebot_tests.py @@ -1,19 +1,18 @@ # -*- coding: utf-8 -*- """Tests for archivebot scripts.""" # -# (C) Pywikibot team, 2014-2018 +# (C) Pywikibot team, 2014-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - +from contextlib import suppress from datetime import datetime, timedelta import pywikibot import pywikibot.page from pywikibot.textlib import TimeStripper -from pywikibot.tools import suppress_warnings, StringTypes as basestring +from pywikibot.tools import suppress_warnings from scripts import archivebot @@ -139,7 +138,7 @@ self.assertIsInstance(talk.archives, dict) self.assertIsInstance(talk.archived_threads, int) self.assertTrue(talk.archiver is None) - self.assertIsInstance(talk.header, basestring) + self.assertIsInstance(talk.header, str) self.assertIsInstance(talk.timestripper, TimeStripper) self.assertIsInstance(talk.threads, list) @@ -150,14 +149,14 @@ for thread in talk.threads: self.assertIsInstance(thread, archivebot.DiscussionThread) - self.assertIsInstance(thread.title, basestring) + self.assertIsInstance(thread.title, str) self.assertIsInstance(thread.now, datetime) self.assertEqual(thread.now, talk.now) self.assertIsInstance(thread.ts, TimeStripper) self.assertEqual(thread.ts, talk.timestripper) - self.assertIsInstance(thread.code, basestring) + self.assertIsInstance(thread.code, str) self.assertEqual(thread.code, talk.timestripper.site.code) - self.assertIsInstance(thread.content, basestring) + self.assertIsInstance(thread.content, str) try: self.assertIsInstance(thread.timestamp, datetime) except AssertionError: @@ -204,7 +203,7 @@ self.assertIsInstance(talk.archives, dict) self.assertIsInstance(talk.archived_threads, int) self.assertTrue(talk.archiver is None) - self.assertIsInstance(talk.header, basestring) + self.assertIsInstance(talk.header, str) self.assertIsInstance(talk.timestripper, TimeStripper) self.assertIsInstance(talk.threads, list) @@ -216,14 +215,14 @@ for thread in talk.threads: self.assertIsInstance(thread, archivebot.DiscussionThread) - self.assertIsInstance(thread.title, basestring) + self.assertIsInstance(thread.title, str) self.assertIsInstance(thread.now, datetime) self.assertEqual(thread.now, talk.now) self.assertIsInstance(thread.ts, TimeStripper) self.assertEqual(thread.ts, talk.timestripper) - self.assertIsInstance(thread.code, basestring) + self.assertIsInstance(thread.code, str) self.assertEqual(thread.code, talk.timestripper.site.code) - self.assertIsInstance(thread.content, basestring) + self.assertIsInstance(thread.content, str) try: self.assertIsInstance(thread.timestamp, datetime) except AssertionError: @@ -363,7 +362,5 @@ if __name__ == '__main__': # pragma: no cover - try: + with suppress(SystemExit): unittest.main() - except SystemExit: - pass diff --git a/tests/compat2core_tests.py b/tests/compat2core_tests.py index 122c8c0..6147375 100644 --- a/tests/compat2core_tests.py +++ b/tests/compat2core_tests.py @@ -1,14 +1,10 @@ # -*- coding: utf-8 -*- """compat2core.py tests.""" # -# (C) Pywikibot team, 2019 +# (C) Pywikibot team, 2019-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals - -from pywikibot.tools import StringTypes - import scripts.maintenance.compat2core as c2c from tests.aspects import unittest, TestCase @@ -24,15 +20,15 @@ """Test compat2core replacements.""" for item in c2c.replacements: self.assertLength(item, 2) - self.assertIsInstance(item[0], StringTypes) - self.assertIsInstance(item[1], StringTypes) + self.assertIsInstance(item[0], str) + self.assertIsInstance(item[1], str) def test_warnings(self): """Test compat2core warnings.""" for item in c2c.warnings: self.assertLength(item, 2) - self.assertIsInstance(item[0], StringTypes) - self.assertIsInstance(item[1], StringTypes) + self.assertIsInstance(item[0], str) + self.assertIsInstance(item[1], str) def test_bot(self): """Test compat2core bot.""" diff --git a/tests/family_tests.py b/tests/family_tests.py index c944d15..cba5a27 100644 --- a/tests/family_tests.py +++ b/tests/family_tests.py @@ -5,13 +5,13 @@ # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals +from contextlib import suppress import pywikibot.site from pywikibot.exceptions import UnknownFamily from pywikibot.family import Family, SingleSiteFamily -from pywikibot.tools import StringTypes as basestring, suppress_warnings +from pywikibot.tools import suppress_warnings from tests.aspects import ( unittest, @@ -43,11 +43,11 @@ self.assertTrue(f.langs) self.assertTrue(f.codes) self.assertTrue(iter(f.codes)) - self.assertIsInstance(next(iter(f.codes)), basestring) + self.assertIsInstance(next(iter(f.codes)), str) self.assertTrue(f.domains) self.assertTrue(iter(f.domains)) for domain in f.domains: - self.assertIsInstance(domain, basestring) + self.assertIsInstance(domain, str) if domain.split(':', 1)[0] != 'localhost': self.assertIn('.', domain) @@ -187,7 +187,7 @@ def setUp(self): """Setup default article path.""" - super(TestFamilyUrlRegex, self).setUp() + super().setUp() self.article_path = '/wiki/$1' def test_from_url_wikipedia_extra(self): @@ -304,7 +304,5 @@ if __name__ == '__main__': # pragma: no cover - try: + with suppress(SystemExit): unittest.main() - except SystemExit: - pass diff --git a/tests/i18n_tests.py b/tests/i18n_tests.py index 2f0e164..9b4c515 100644 --- a/tests/i18n_tests.py +++ b/tests/i18n_tests.py @@ -1,16 +1,15 @@ # -*- coding: utf-8 -*- """Test i18n module.""" # -# (C) Pywikibot team, 2007-2019 +# (C) Pywikibot team, 2007-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals +from contextlib import suppress import pywikibot from pywikibot import i18n, bot, plural -from pywikibot.tools import StringTypes from tests.aspects import ( unittest, TestCase, DefaultSiteTestCase, PwbTestCase, @@ -33,7 +32,7 @@ 'nl': 'test-semi-localized NL'} self.msg_non_localized = {'en': 'test-non-localized EN'} self.msg_no_english = {'ja': 'test-no-english JA'} - super(TestTranslate, self).setUp() + super().setUp() def test_localized(self): """Test fully localized translations.""" @@ -76,14 +75,14 @@ def setUp(self): """Change the userinterface language to the site's code.""" - super(UserInterfaceLangTestCase, self).setUp() + super().setUp() self.orig_userinterface_lang = pywikibot.config.userinterface_lang pywikibot.config.userinterface_lang = self.get_site().code def tearDown(self): """Reset the userinterface language.""" pywikibot.config.userinterface_lang = self.orig_userinterface_lang - super(UserInterfaceLangTestCase, self).tearDown() + super().tearDown() class TWNSetMessagePackageBase(TestCase): @@ -96,11 +95,11 @@ """Load the test translations.""" self.orig_messages_package_name = i18n._messages_package_name i18n.set_messages_package(self.message_package) - super(TWNSetMessagePackageBase, self).setUp() + super().setUp() def tearDown(self): """Load the original translations back.""" - super(TWNSetMessagePackageBase, self).tearDown() + super().tearDown() i18n.set_messages_package(self.orig_messages_package_name) @@ -111,7 +110,7 @@ @classmethod def setUpClass(cls): """Verify that the test translations are not empty.""" - if not isinstance(cls.message_package, StringTypes): + if not isinstance(cls.message_package, str): raise TypeError('{}.message_package must be a package name' .format(cls.__name__)) # The call to set_messages_package below exists only to confirm @@ -124,7 +123,7 @@ if not has_messages: raise unittest.SkipTest("i18n messages package '{}' not available." .format(cls.message_package)) - super(TWNTestCaseBase, cls).setUpClass() + super().setUpClass() class TestTWTranslate(TWNTestCaseBase): @@ -350,7 +349,7 @@ @classmethod def setUpClass(cls): """Verify that a translation does not yet exist.""" - super(InputTestCase, cls).setUpClass() + super().setUpClass() if cls.code in i18n.twget_keys(cls.message): raise unittest.SkipTest( @@ -378,7 +377,7 @@ def setUp(self): """Patch the output and input methods.""" - super(MissingPackageTestCase, self).setUp() + super().setUp() self.output_text = '' self.orig_raw_input = bot.ui._raw_input self.orig_output = bot.ui.output @@ -389,7 +388,7 @@ """Restore the output and input methods.""" bot.ui._raw_input = self.orig_raw_input bot.ui.output = self.orig_output - super(MissingPackageTestCase, self).tearDown() + super().tearDown() def test_pagegen_i18n_input(self): """Test i18n.input falls back with missing message package.""" @@ -472,7 +471,5 @@ if __name__ == '__main__': # pragma: no cover - try: + with suppress(SystemExit): unittest.main() - except SystemExit: - pass diff --git a/tests/user_tests.py b/tests/user_tests.py index 6b75116..3396be9 100644 --- a/tests/user_tests.py +++ b/tests/user_tests.py @@ -1,17 +1,17 @@ # -*- coding: utf-8 -*- """Tests for the User page.""" # -# (C) Pywikibot team, 2016-2019 +# (C) Pywikibot team, 2016-2020 # # Distributed under the terms of the MIT license. # -from __future__ import absolute_import, division, unicode_literals +from contextlib import suppress import pywikibot from pywikibot import Page, Timestamp, User from pywikibot.exceptions import AutoblockUser -from pywikibot.tools import StringTypes, suppress_warnings +from pywikibot.tools import suppress_warnings from tests import patch from tests.aspects import DefaultSiteTestCase, TestCase, unittest @@ -183,7 +183,7 @@ self.assertIsInstance(p, Page) self.assertIsInstance(i, int) self.assertIsInstance(t, Timestamp) - self.assertIsInstance(c, StringTypes) + self.assertIsInstance(c, str) self.assertEqual(last, user.last_edit) def test_logevents(self): @@ -201,7 +201,5 @@ if __name__ == '__main__': # pragma: no cover - try: + with suppress(SystemExit): unittest.main() - except SystemExit: - pass -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616047 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: Ia3c8607bf13962d7ffcb169cf8963bee30e02e6d Gerrit-Change-Number: 616047 Gerrit-PatchSet: 5 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Isaacandy <isaac(a)iznd.xyz> Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com> Gerrit-Reviewer: Siebrand <siebrand(a)kitano.nl> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

[Gerrit] ...core[master]: [doc] mock is part of unittest in Python 3

by jenkins-bot (Code Review)

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616440 ) Change subject: [doc] mock is part of unittest in Python 3 ...................................................................... [doc] mock is part of unittest in Python 3 Change-Id: I982ba1a7e84d258a3588067698158b40484ca54e --- M tests/README.rst 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/README.rst b/tests/README.rst index 7d10f89..7f84377 100644 --- a/tests/README.rst +++ b/tests/README.rst @@ -266,7 +266,7 @@ @require_modules(['important1', 'musthave2']) def test_require_modules(self): -(a)(unittest.)mock.patch +(a)unittest.mock.patch ----------------------- Replaces `target` with object specified in `new`. Refer to mock's documentation. This is especially useful in tests, where requests to third-parties should be -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/616440 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: I982ba1a7e84d258a3588067698158b40484ca54e Gerrit-Change-Number: 616440 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

3 years, 9 months

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits July 2020