jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/928986 )
Change subject: [cleanup] Remove deprecation of private attributes and methods
......................................................................
[cleanup] Remove deprecation of private attributes and methods
- remove _treat_counter, _save_counter and _skip_counter BaseNot attributes
- remove _simple_request APISite method
- update documentation
Change-Id: If9333dc29a87cbf9fe5b926203b77678c618aa71
---
M ROADMAP.rst
M pywikibot/site/_apisite.py
M pywikibot/bot.py
3 files changed, 15 insertions(+), 40 deletions(-)
Approvals:
JJMC89: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ROADMAP.rst b/ROADMAP.rst
index ce37c11..7850d4d 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -52,9 +52,7 @@
:attr:`use_redirects<bot.BaseBot.use_redirects>` attribute
* 7.2.0: :func:`tools.formatter.color_format<tools.formatter.color_format>` is
deprecated and will be removed
* 7.1.0: Unused ``get_redirect`` parameter of
:meth:`Page.getOldVersion()<page.BasePage.getOldVersion>` will be removed
-* 7.1.0: APISite._simple_request() will be removed in favour of
APISite.simple_request()
* 7.0.0: User.isBlocked() method is renamed to is_blocked for consistency
-* 7.0.0: Private BaseBot counters _treat_counter, _save_counter, _skip_counter
will be removed in favour of collections.Counter counter attribute
* 7.0.0: A boolean watch parameter in Page.save() is deprecated and will be
desupported
* 7.0.0: baserevid parameter of editSource(), editQualifier(), removeClaims(),
removeSources(), remove_qualifiers() DataSite methods will be removed
* 7.0.0: Values of APISite.allpages() parameter filterredir other than True,
False and None are deprecated
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index a15efd7..946d2dc 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -57,7 +57,7 @@
``put_current`` is used.
"""
#
-# (C) Pywikibot team, 2008-2022
+# (C) Pywikibot team, 2008-2023
#
# Distributed under the terms of the MIT license.
#
@@ -175,7 +175,6 @@
from pywikibot.throttle import Throttle
from pywikibot.tools import (
PYTHON_VERSION,
- deprecated,
issue_deprecation_warning,
strtobool,
)
@@ -1364,36 +1363,6 @@
self.treat_page_type: Any = pywikibot.page.BasePage
@property
- @deprecated("self.counter['read']", since='7.0.0')
- def _treat_counter(self):
- return self.counter['read']
-
- @_treat_counter.setter
- @deprecated("self.counter['read']", since='7.0.0')
- def _treat_counter(self, value) -> None:
- self.counter['read'] = value
-
- @property
- @deprecated("self.counter['write']", since='7.0.0')
- def _save_counter(self):
- return self.counter['write']
-
- @_save_counter.setter
- @deprecated("self.counter['write']", since='7.0.0')
- def _save_counter(self, value) -> None:
- self.counter['write'] = value
-
- @property
- @deprecated("self.counter['skip']", since='7.0.0')
- def _skip_counter(self):
- return self.counter['skip']
-
- @_skip_counter.setter
- @deprecated("self.counter['skip']", since='7.0.0')
- def _skip_counter(self, value) -> None:
- self.counter['skip'] = value
-
- @property
def current_page(self) -> 'pywikibot.page.BasePage':
"""Return the current working page as a property."""
assert self._current_page is not None
diff --git a/pywikibot/site/_apisite.py b/pywikibot/site/_apisite.py
index 77a9a32..53a70f4 100644
--- a/pywikibot/site/_apisite.py
+++ b/pywikibot/site/_apisite.py
@@ -285,15 +285,10 @@
return self._request_class(kwargs)(site=self, **kwargs)
- @deprecated('simple_request', since='7.1.0')
- def _simple_request(self, **kwargs: Any) -> api.Request:
- """DEPRECATED. Create a request using all kwargs as parameters."""
- return self.simple_request(**kwargs)
-
def simple_request(self, **kwargs: Any) -> api.Request:
"""Create a request by defining all kwargs as parameters.
- .. versionchanged:: 7.1
+ .. versionadded:: 7.1
`_simple_request` becomes a public method
"""
return self._request_class({'parameters': kwargs}).create_simple(
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/928986
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: If9333dc29a87cbf9fe5b926203b77678c618aa71
Gerrit-Change-Number: 928986
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: JJMC89 <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
