jenkins-bot submitted this change.
[cleanup] Remove desupported parts
Remove code parts which are deprecated for more than 5 years
and a FutureWarning was printed when used.
Change-Id: Ic168b4fab9bf5cc3c7a0fc0054d5fe6b6e13180d
---
M pywikibot/__init__.py
M pywikibot/data/api.py
M pywikibot/pagegenerators.py
M pywikibot/specialbots/_upload.py
M scripts/category.py
5 files changed, 2 insertions(+), 105 deletions(-)
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 0a9dac4..97dadda 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -197,10 +197,6 @@
"""
return self.strftime(self._ISO8601Format(sep))
- toISOformat = redirect_func(isoformat, old_name='toISOformat',
- class_name='Timestamp', since='20141219',
- future_warning=True)
-
def totimestampformat(self):
"""Convert object to a MediaWiki internal timestamp."""
return self.strftime(self.mediawikiTSFormat)
@@ -1410,8 +1406,6 @@
_putthread.setDaemon(True)
wrapper = _ModuleDeprecationWrapper(__name__)
-wrapper._add_deprecated_attr('ImagePage', FilePage, since='20140924',
- future_warning=True)
wrapper._add_deprecated_attr(
'cookie_jar', replacement_name='pywikibot.comms.http.cookie_jar',
since='20150921')
diff --git a/pywikibot/data/api.py b/pywikibot/data/api.py
index 4c896fd..4994c9e 100644
--- a/pywikibot/data/api.py
+++ b/pywikibot/data/api.py
@@ -2878,22 +2878,6 @@
return p
-@deprecated('PageGenerator', since='20141106', future_warning=True)
-class CategoryPageGenerator(PageGenerator):
-
- """Like PageGenerator, but yields Category objects instead of Pages."""
-
- pass
-
-
-@deprecated('PageGenerator', since='20141106', future_warning=True)
-class ImagePageGenerator(PageGenerator):
-
- """Like PageGenerator, but yields FilePage objects instead of Pages."""
-
- pass
-
-
class PropertyGenerator(QueryGenerator):
"""Iterator for queries of type action=query&prop=foo.
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 4e7dc6d..eabc1a9 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -1328,32 +1328,6 @@
pywikibot.exception(e)
-@deprecated('LogeventsPageGenerator', since='20141210', future_warning=True)
-@deprecated_args(number='total', mode='logtype', repeat=None)
-def LogpagesPageGenerator(total=500, logtype='', user=None,
- site=None, namespace=[]):
- """
- Generate Pages for specified modes of logevents.
-
- This is the backwards compatible one.
- See LogeventsPageGenerator
-
- @param mode: Mode of logs to retrieve
- @type mode: basestring
- @param user: User of logs retrieved
- @type user: basestring
- @param site: Site for generator results
- @type site: L{pywikibot.site.BaseSite}
- @param namespace: Namespace to retrieve logs from
- @type namespace: int
- @param total: Maximum number of pages to retrieve in total
- @type total: int
- """
- return LogeventsPageGenerator(total=total, logtype=logtype, user=user,
- site=site,
- namespace=namespace) # pragma: no cover
-
-
@deprecated_args(number='total', step=None, namespace='namespaces',
repeat=None, get_redirect=None)
def NewpagesPageGenerator(site=None, namespaces=[0], total=None):
@@ -3087,16 +3061,6 @@
PageClassGenerator, old_name='FileGenerator', since='20161017')
CategoryGenerator = redirect_func(
PageClassGenerator, old_name='CategoryGenerator', since='20161017')
-UnCategorizedTemplatesGenerator = redirect_func(
- UnCategorizedTemplateGenerator, old_name='UnCategorizedTemplatesGenerator',
- since='20141225', future_warning=True)
-RecentchangesPageGenerator = redirect_func(
- RecentChangesPageGenerator, old_name='RecentchangesPageGenerator',
- since='20141225', future_warning=True)
-# Deprecated old names from Pywikibot 2.0 beta1
-WikidataItemGenerator = redirect_func(
- WikibaseItemGenerator, old_name='WikidataItemGenerator',
- since='20141225', future_warning=True)
wrapper = ModuleDeprecationWrapper(__name__)
wrapper._add_deprecated_attr('YahooSearchPageGenerator', replacement_name='',
since='20181128')
diff --git a/pywikibot/specialbots/_upload.py b/pywikibot/specialbots/_upload.py
index 7db395a..3cc1fed 100644
--- a/pywikibot/specialbots/_upload.py
+++ b/pywikibot/specialbots/_upload.py
@@ -22,7 +22,7 @@
from pywikibot import config
from pywikibot.bot import BaseBot, QuitKeyboardInterrupt
-from pywikibot.tools import deprecated, deprecated_args
+from pywikibot.tools import deprecated_args
from pywikibot.tools.formatter import color_format
@@ -375,13 +375,6 @@
else:
return warn_code in self.ignore_warning
- @deprecated('UploadRobot.upload_file()', since='20141211',
- future_warning=True)
- @deprecated_args(debug=True)
- def upload_image(self):
- """Upload image."""
- return self.upload_file(self.url)
-
def upload_file(self, file_url, _file_key=None, _offset=0):
"""
Upload the image at file_url to the target wiki.
diff --git a/scripts/category.py b/scripts/category.py
index f725d1c..1989a3a 100755
--- a/scripts/category.py
+++ b/scripts/category.py
@@ -137,9 +137,7 @@
BaseBot, Bot, MultipleSitesBot,
)
from pywikibot.cosmetic_changes import moved_links
-from pywikibot.tools import (
- deprecated_args, deprecated, ModuleDeprecationWrapper, open_archive,
-)
+from pywikibot.tools import deprecated_args, open_archive
from pywikibot.tools.formatter import color_format
# This is required for the text that is shown when you run this script
@@ -877,38 +875,6 @@
return var
-class CategoryRemoveRobot(CategoryMoveRobot):
-
- """Removes the category tag for a given category.
-
- It always removes the category tag for all pages in that given category.
-
- If pagesonly parameter is False it removes also the category from all
- subcategories, without prompting. If the category is empty, it will be
- tagged for deleting. Does not remove category tags pointing at
- subcategories.
-
- @deprecated: Using CategoryRemoveRobot is deprecated, use
- CategoryMoveRobot without newcat param instead.
- """
-
- @deprecated('CategoryMoveRobot without newcat parameter', since='20140416',
- future_warning=True)
- def __init__(
- self, catTitle, batchMode=False, editSummary='',
- useSummaryForDeletion=CategoryMoveRobot.DELETION_COMMENT_AUTOMATIC,
- titleRegex=None, inPlace=False, pagesonly=False) -> None:
- """Initializer."""
- super().__init__(
- oldcat=catTitle,
- batch=batchMode,
- comment=editSummary,
- deletion_comment=useSummaryForDeletion,
- title_regex=titleRegex,
- inplace=inPlace,
- pagesonly=pagesonly)
-
-
class CategoryListifyRobot:
"""Create a list containing all of the members in a category."""
@@ -1547,7 +1513,3 @@
if __name__ == '__main__':
main()
-
-wrapper = ModuleDeprecationWrapper(__name__)
-wrapper._add_deprecated_attr('AddCategory', CategoryAddBot, since='20140918',
- future_warning=True)
To view, visit change 625662. To unsubscribe, or for help writing mail filters, visit settings.