jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/621865 )
Change subject: [py3] remove Python 2 code from tests/__init__.py
......................................................................
[py3] remove Python 2 code from tests/__init__.py
Change-Id: I98672b75dd0f4b935f71a176e5c1fb3b5682ee35
---
M tests/__init__.py
1 file changed, 19 insertions(+), 29 deletions(-)
Approvals:
Matěj Suchánek: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/__init__.py b/tests/__init__.py
index 628cfe0..b6fd569 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -5,40 +5,35 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import (absolute_import, division,
- print_function, unicode_literals)
-
__all__ = (
'requests', 'unittest', 'TestRequest',
'patch_request', 'unpatch_request',
'mock', 'Mock', 'MagicMock', 'patch')
import functools
-from itertools import chain
import os
import unittest
-from unittest.util import safe_repr
import warnings
+from contextlib import suppress
+from itertools import chain
+from unittest import mock
+from unittest.mock import MagicMock, Mock, patch
+from unittest.util import safe_repr
+
# Verify that the unit tests have a base working environment:
# - requests is mandatory
# however if unavailable this will fail on use; see pywikibot/tools.py
# - mwparserfromhell is optional, so is only imported in textlib_tests
import requests
-from pywikibot import config
import pywikibot.data.api
+
+from pywikibot import config
from pywikibot.data.api import CachedRequest
from pywikibot.data.api import Request as _original_Request
from pywikibot.tools import PYTHON_VERSION
-try:
- import unittest.mock as mock
- from unittest.mock import MagicMock, Mock, patch
-except ImportError:
- import mock
- from mock import MagicMock, Mock, patch
-
assert safe_repr # pyflakes workaround
_root_dir = os.path.split(os.path.split(__file__)[0])[0]
@@ -292,7 +287,7 @@
def __init__(self, *args, **kwargs):
"""Initializer."""
- super(TestRequest, self).__init__(0, *args, **kwargs)
+ super().__init__(0, *args, **kwargs)
@classmethod
def create_simple(cls, **kwargs):
@@ -306,25 +301,22 @@
def _load_cache(self):
"""Return whether the cache can be used."""
- if not super(TestRequest, self)._load_cache():
- global cache_misses
+ global cache_hits
+ global cache_misses
+
+ if not super()._load_cache():
cache_misses += 1
return False
# tokens need careful management in the cache
# and can't be aggressively cached.
# FIXME: remove once 'badtoken' is reliably handled in api.py
- if 'intoken' in self._uniquedescriptionstr():
- self._data = None
- return False
+ for desc in ('intoken', 'lgpassword'):
+ if desc in self._uniquedescriptionstr():
+ self._data = None
+ return False
- if 'lgpassword' in self._uniquedescriptionstr():
- self._data = None
- return False
-
- global cache_hits
cache_hits += 1
-
return True
def _write_cache(self, data):
@@ -335,7 +327,7 @@
if 'lgpassword' in self._uniquedescriptionstr():
return
- return super(TestRequest, self)._write_cache(data)
+ return super()._write_cache(data)
original_expired = None
@@ -356,7 +348,5 @@
if __name__ == '__main__': # pragma: no cover
- try:
+ with suppress(SystemExit):
unittest.main()
- except SystemExit:
- pass
--
To view, visit
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/621865
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: I98672b75dd0f4b935f71a176e5c1fb3b5682ee35
Gerrit-Change-Number: 621865
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Matěj Suchánek <matejsuchanek97(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged