jenkins-bot has submitted this change. (
https://gerrit.wikimedia.org/r/c/pywikibot/core/+/630375 )
Change subject: [Py2] Remove Python 2 code in thread_tests.py
......................................................................
[Py2] Remove Python 2 code in thread_tests.py
Change-Id: I3e467ff07bde42bad43361a4deef4748dace4ad6
---
M tests/thread_tests.py
1 file changed, 4 insertions(+), 10 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/thread_tests.py b/tests/thread_tests.py
index 2aef920..81d5ff7 100644
--- a/tests/thread_tests.py
+++ b/tests/thread_tests.py
@@ -1,11 +1,11 @@
# -*- coding: utf-8 -*-
"""Tests for threading tools."""
#
-# (C) Pywikibot team, 2014-2018
+# (C) Pywikibot team, 2014-2020
#
# Distributed under the terms of the MIT license.
#
-from __future__ import absolute_import, division, unicode_literals
+from contextlib import suppress
from tests.aspects import unittest, TestCase
@@ -28,8 +28,7 @@
def gen_func(self):
"""Helper method for generator test."""
iterable = 'abcd'
- for i in iterable:
- yield i
+ yield from iterable
def test_run_from_gen_function(self):
"""Test thread running with generator as target."""
@@ -48,13 +47,10 @@
# If they are a generator, we need to convert to a list
# first otherwise the generator is empty the second time.
datasets = [list(gen) for gen in gens]
-
set_result = set(datasets[0]).intersection(*datasets[1:])
-
result = list(intersect_generators(datasets))
self.assertCountEqual(set(result), result)
-
self.assertCountEqual(result, set_result)
@@ -74,7 +70,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/+/630375
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: I3e467ff07bde42bad43361a4deef4748dace4ad6
Gerrit-Change-Number: 630375
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <[email protected]>
Gerrit-Reviewer: Xqt <[email protected]>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
_______________________________________________
Pywikibot-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/pywikibot-commits
