jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/656543 ) Change subject: [cleanup] Remove deprecated parts in interwiki_graph.py ...................................................................... [cleanup] Remove deprecated parts in interwiki_graph.py - remove GraphSavingThread.originPage - remove Subject.originPage property - remove Subject.foundIn property - remove pydotfound variable wrapper Change-Id: If79716cca6029ed909df6300089301adea026807 --- M pywikibot/interwiki_graph.py 1 file changed, 1 insertion(+), 51 deletions(-) Approvals: JJMC89: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/interwiki_graph.py b/pywikibot/interwiki_graph.py index 60ca578..2acbf85 100644 --- a/pywikibot/interwiki_graph.py +++ b/pywikibot/interwiki_graph.py @@ -1,6 +1,6 @@ """Module with the Graphviz drawing calls.""" # -# (C) Pywikibot team, 2006-2020 +# (C) Pywikibot team, 2006-2021 # # Distributed under the terms of the MIT license. # @@ -13,8 +13,6 @@ import pywikibot from pywikibot import config2 as config -from pywikibot.tools import ( - deprecated, deprecated_args, ModuleDeprecationWrapper) try: import pydot @@ -40,27 +38,12 @@ mechanism to kill a thread if it takes too long. """ - @deprecated_args(originPage='origin') # since 20200617 def __init__(self, graph, origin): """Initializer.""" super().__init__() self.graph = graph self.origin = origin - @property - @deprecated('GraphSavingThread.origin', since='20200617') - def originPage(self): - """Deprecated property for the origin page. - - DEPRECATED. Use origin. - """ - return self.origin - - @originPage.setter - @deprecated('GraphSavingThread.origin', since='20200617') - def originPage(self, value): - self.origin = value - def run(self): """Write graphs to the data directory.""" for fmt in config.interwiki_graph_formats: @@ -102,32 +85,6 @@ def origin(self, value): self._origin = value - @property - @deprecated('Subject.origin', since='20150125', future_warning=True) - def originPage(self): - """DEPRECATED. Deprecated property for the origin page.""" - return self.origin - - @originPage.setter - @deprecated('Subject.origin', since='20150125', future_warning=True) - def originPage(self, value): - self.origin = value - - @property - @deprecated('Subject.found_in', since='20150125', future_warning=True) - def foundIn(self): - """Mapping of pages to others pages interwiki linked to it. - - DEPRECATED. Use found_in. - """ - return self.found_in - - @foundIn.setter - @deprecated('Subject.found_in', since='20150125', future_warning=True) - def foundIn(self, value): - """DEPRECATED. Temporary property setter to support code migration.""" - self.found_in = value - class GraphDrawer: @@ -269,10 +226,3 @@ if extension: filename += '.{}'.format(extension) return filename - - -wrapper = ModuleDeprecationWrapper(__name__) -wrapper._add_deprecated_attr( - 'pydotfound', - replacement_name='"not isinstance(pydot, ImportError)"', - since='2015125', future_warning=True) -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/656543 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: If79716cca6029ed909df6300089301adea026807 Gerrit-Change-Number: 656543 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged