jenkins-bot submitted this change.

View Change

Approvals: Matěj Suchánek: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified
[cleanup] Remove deprecated parts in archivebot.py

Change-Id: I7f1defa00e975ca1ca5b5b2d62139540acda9403
---
M scripts/archivebot.py
1 file changed, 4 insertions(+), 24 deletions(-)

diff --git a/scripts/archivebot.py b/scripts/archivebot.py
index 4bf4923..86998cb 100755
--- a/scripts/archivebot.py
+++ b/scripts/archivebot.py
@@ -88,7 +88,7 @@
-salt:SALT specify salt
"""
#
-# (C) Pywikibot team, 2006-2020
+# (C) Pywikibot team, 2006-2021
#
# Distributed under the terms of the MIT license.
#
@@ -337,14 +337,8 @@
:Reply, etc. ~~~~
"""

- def __init__(self, title: str, _now=None, timestripper=None) -> None:
+ def __init__(self, title: str, timestripper: TimeStripper) -> 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.ts = timestripper
self.code = self.ts.site.code
@@ -448,8 +442,8 @@
else:
self.header = header + footer
for thread_heading, thread_content in threads:
- cur_thread = DiscussionThread(
- thread_heading.strip('= '), timestripper=self.timestripper)
+ cur_thread = DiscussionThread(thread_heading.strip('= '),
+ self.timestripper)
# remove heading line
_, *lines = thread_content.replace(marker, '').splitlines()
for line in lines:
@@ -633,20 +627,6 @@
self.archives[title] = DiscussionPage(archive, self, params)
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

To view, visit change 670246. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I7f1defa00e975ca1ca5b5b2d62139540acda9403
Gerrit-Change-Number: 670246
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info@gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki@aol.com>
Gerrit-Reviewer: DannyS712 <DannyS712.enwiki@gmail.com>
Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97@gmail.com>
Gerrit-Reviewer: Xqt <info@gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged