jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/649407 )
Change subject: [cleanup] remove unsupported pywikibot.cookie_jar
......................................................................
[cleanup] remove unsupported pywikibot.cookie_jar
Change-Id: I621285f5b2bffcb6238ecccc5a0ca44dba5041b9
---
M pywikibot/__init__.py
M tests/http_tests.py
2 files changed, 0 insertions(+), 21 deletions(-)
Approvals:
Mpaa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index c09747f..25a7100 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -1317,9 +1317,6 @@
wrapper = _ModuleDeprecationWrapper(__name__)
wrapper._add_deprecated_attr(
- 'cookie_jar', replacement_name='pywikibot.comms.http.cookie_jar',
- since='20150921', future_warning=True)
-wrapper._add_deprecated_attr(
'QuitKeyboardInterrupt', _QuitKeyboardInterrupt,
warning_message='pywikibot.QuitKeyboardInterrupt is deprecated; '
'use pywikibot.bot.QuitKeyboardInterrupt instead.',
diff --git a/tests/http_tests.py b/tests/http_tests.py
index 346a283..b9d6dc2 100644
--- a/tests/http_tests.py
+++ b/tests/http_tests.py
@@ -23,7 +23,6 @@
from tests.aspects import (
unittest,
TestCase,
- DeprecationTestCase,
HttpbinTestCase,
require_modules,
)
@@ -552,23 +551,6 @@
self.assertEqual(r.content, self.png)
-class TestDeprecatedGlobalCookieJar(DeprecationTestCase):
-
- """Test usage of deprecated pywikibot.cookie_jar."""
-
- net = False
-
- def test_cookie_jar(self):
- """Test pywikibot.cookie_jar is deprecated."""
- # Accessing from the main package should be deprecated.
- main_module_cookie_jar = pywikibot.cookie_jar
-
- self.assertOneDeprecationParts('pywikibot.cookie_jar',
- 'pywikibot.comms.http.cookie_jar')
-
- self.assertIs(main_module_cookie_jar, http.cookie_jar)
-
-
class QueryStringParamsTestCase(HttpbinTestCase):
"""
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/649407
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: I621285f5b2bffcb6238ecccc5a0ca44dba5041b9
Gerrit-Change-Number: 649407
Gerrit-PatchSet: 5
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged