jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1009207?usp=email )
Change subject: [doc] Warning: Do not use Pywikibot >= 9 together with Pywikibot <= 3.0.20181203
......................................................................
[doc] Warning: Do not use Pywikibot >= 9 together with Pywikibot <= 3.0.20181203
Change-Id: I7bd02088c1968eea383813e020586f5d3ac126cb
---
M ROADMAP.rst
1 file changed, 10 insertions(+), 0 deletions(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/ROADMAP.rst b/ROADMAP.rst
index 7f96ce1..a7e5b9e 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -45,6 +45,7 @@
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
* Cache directory was renamed from ``apicache-py3`` to ``apicache`` due to timestamp changes. (:phab:`T337748`)
+ **Warning:** Do not use Pywikibot 9+ together with Pywikibot 3.0.20181203 and below.
* Raise ``TypeError`` instead of ``AttributeError`` in :meth:`Site.randompages()
<pywikibot.site._generators.GeneratorsMixin.randompages>` if *redirects* parameter is invalid.
* A RuntimeError will be raised if a :class:`family.Family` subclass has an ``__init__`` initializer method.
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1009207?usp=email
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: I7bd02088c1968eea383813e020586f5d3ac126cb
Gerrit-Change-Number: 1009207
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1007342?usp=email )
Change subject: [IMPR] remove sorting from page_gen generator
......................................................................
[IMPR] remove sorting from page_gen generator
The page_gen method retrieves pages by the get_page() index which
lies within start and end parameters. The sorting key is found by
get_number() function which gives the same value which is previously
given by the index of get_page. Therefore the sorting is needless but
the sorting build-in function is greedy and retrieves all pages which
is not in the sense of the generator.
Change-Id: Ibbcf55f02500fd1c0bd4e95bcac267aded4fc777
---
M pywikibot/proofreadpage.py
1 file changed, 17 insertions(+), 9 deletions(-)
Approvals:
Xqt: Verified; Looks good to me, approved
diff --git a/pywikibot/proofreadpage.py b/pywikibot/proofreadpage.py
index b28b9fa..e75f397 100644
--- a/pywikibot/proofreadpage.py
+++ b/pywikibot/proofreadpage.py
@@ -1316,8 +1316,6 @@
Range is [start ... end], extremes included.
- .. versionchanged:: 8.6
- page names are sorted before loading pages.
.. versionchanged:: 9.0
The *content* parameter was removed
@@ -1339,13 +1337,7 @@
filter_ql = list(self.site.proofread_levels)
filter_ql.remove(ProofreadPage.WITHOUT_TEXT)
- gen = [self.get_page(i) for i in range(start, end + 1)]
-
- # Decorate and sort by page number because preloadpages does not
- # guarantee order.
- # TODO: remove if preloadpages will guarantee order.
- gen = [(self.get_number(p), p) for p in gen]
- gen = [p for n, p in sorted(gen)]
+ gen = (self.get_page(i) for i in range(start, end + 1))
gen = self.site.preloadpages(gen)
# Filter by QL.
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1007342?usp=email
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: Ibbcf55f02500fd1c0bd4e95bcac267aded4fc777
Gerrit-Change-Number: 1007342
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1008845?usp=email )
Change subject: [tests] Ensure that FamilyTestGenerator.getapis does not get duplicates
......................................................................
[tests] Ensure that FamilyTestGenerator.getapis does not get duplicates
Bug: T359156
Change-Id: I78017a988c3b9ae3b4f22c6a5889ad64924c087a
---
M tests/generate_family_file_tests.py
1 file changed, 26 insertions(+), 4 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/generate_family_file_tests.py b/tests/generate_family_file_tests.py
index 6058930..844a535 100755
--- a/tests/generate_family_file_tests.py
+++ b/tests/generate_family_file_tests.py
@@ -26,13 +26,25 @@
def getapis(self):
"""Only load up to additional ten different wikis randomly."""
save = self.langs
- self.langs = sample(save, min(len(save), 10))
- for wiki in save: # add closed wiki due to T334714
- if wiki['prefix'] == 'ii' and 'ii' not in self.langs:
+
+ prefixes = {lang['prefix'] for lang in self.langs}
+ tests = set(sample(list(prefixes), min(len(prefixes), 10)))
+ # add closed wiki due to T334714
+ if 'ii' in prefixes and 'ii' not in tests:
+ tests.add('ii')
+
+ # collect wikis
+ self.langs = []
+ for wiki in save:
+ code = wiki['prefix']
+ if code in tests:
self.langs.append(wiki)
- break
+ tests.remove(code)
+ if not tests:
+ break
super().getapis()
+ # super().getapis() might change self.langs
self.prefixes = [item['prefix'] for item in self.langs]
self.langs = save
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1008845?usp=email
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: I78017a988c3b9ae3b4f22c6a5889ad64924c087a
Gerrit-Change-Number: 1008845
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged