Xqt has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/699897 )
Change subject: [blame] split tools to have a _deprecate module
......................................................................
[blame] split tools to have a _deprecate module
Change-Id: I006ab8e692195e9afb544536aab8d1b5a6d5f823
---
R pywikibot/tools/_deprecate.py
1 file changed, 0 insertions(+), 0 deletions(-)
Approvals:
Xqt: Verified; Looks good to me, approved
diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/_deprecate.py
similarity index 100%
rename from pywikibot/tools/__init__.py
rename to pywikibot/tools/_deprecate.py
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/699897
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: I006ab8e692195e9afb544536aab8d1b5a6d5f823
Gerrit-Change-Number: 699897
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
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/+/699817 )
Change subject: [IMPR] Revise GeneratorsMixin's search deprecation
......................................................................
[IMPR] Revise GeneratorsMixin's search deprecation
Making the changes discussed in CR 693515 [1]...
* Deprecating any use of 'titles' in favor of 'title'. Previously its usage
was only deprecated when the CirrusSearch extension isn't present.
* Only deprecate CirrusSearch's where usage when our family is a
WikimediaFamily.
[1] https://gerrit.wikimedia.org/r/c/pywikibot/core/+/693515
Change-Id: I94ffbba7a9dc398198e92d92a3708fa4582e8ff9
---
M pywikibot/site/_generators.py
1 file changed, 9 insertions(+), 7 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/site/_generators.py b/pywikibot/site/_generators.py
index 16d38fe..30f1245 100644
--- a/pywikibot/site/_generators.py
+++ b/pywikibot/site/_generators.py
@@ -1353,20 +1353,22 @@
if where not in where_types:
raise Error("search: unrecognized 'where' value: {}".format(where))
if where in ('title', 'titles'):
- if self.has_extension('CirrusSearch'):
+ if where == 'titles':
+ issue_deprecation_warning("where='titles'", "where='title'",
+ since='20160224')
+ where = 'title'
+
+ if self.has_extension('CirrusSearch') and \
+ isinstance(self.family, pywikibot.family.WikimediaFamily):
# 'title' search was disabled, use intitle instead
searchstring = 'intitle:' + searchstring
issue_deprecation_warning(
"where='{}'".format(where),
"searchstring='{}'".format(searchstring),
since='20160224')
+
where = None # default
- else:
- if where == 'titles':
- issue_deprecation_warning("where='titles'",
- "where='title'",
- since='20160224')
- where = 'title'
+
if not namespaces and namespaces != 0:
namespaces = [ns_id for ns_id in self.namespaces if ns_id >= 0]
srgen = self._generator(api.PageGenerator, type_arg='search',
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/699817
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: I94ffbba7a9dc398198e92d92a3708fa4582e8ff9
Gerrit-Change-Number: 699817
Gerrit-PatchSet: 1
Gerrit-Owner: Damian <atagar1(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/+/699741 )
Change subject: [doc] fix doc parsing
......................................................................
[doc] fix doc parsing
Change-Id: I66f8d86a78f1a8b40ac14ac723f5f220278717cb
---
M pywikibot/bot.py
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 543ef15..7c038a2 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -1319,11 +1319,11 @@
:param args: passed to the function
:param kwargs: passed to the function
:keyword ignore_server_errors: if True, server errors will be reported
- and ignored (default: False)
- @kwtype ignore_server_errors: bool
+ and ignored (default: False)
+ :kwtype ignore_server_errors: bool
:keyword ignore_save_related_errors: if True, errors related to
- page save will be reported and ignored (default: False)
- @kwtype ignore_save_related_errors: bool
+ page save will be reported and ignored (default: False)
+ :kwtype ignore_save_related_errors: bool
:return: whether the page was saved successfully
:rtype: bool
"""
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/699741
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: I66f8d86a78f1a8b40ac14ac723f5f220278717cb
Gerrit-Change-Number: 699741
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
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/+/699581 )
Change subject: [bugfix] Fix file/url detection for Windows
......................................................................
[bugfix] Fix file/url detection for Windows
Bug: T284886
Change-Id: I9fe198da009cdac45b75e69953369b2a2fbed054
---
M pywikibot/pagegenerators.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 9c59f70..5be66b9 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -1598,7 +1598,7 @@
if site is None:
site = pywikibot.Site()
# If source cannot be parsed as an HTTP URL, treat as local file
- if not urlparse(source).scheme:
+ if not urlparse(source).netloc:
with codecs.open(source, 'r', config.textfile_encoding) as f:
yield from _yield_titles(f, site)
# Else, fetch page (page should return text in same format as that expected
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/699581
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: I9fe198da009cdac45b75e69953369b2a2fbed054
Gerrit-Change-Number: 699581
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
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/+/698732 )
Change subject: [IMPR] Use roundrobin_generators in template.py
......................................................................
[IMPR] Use roundrobin_generators in template.py
Use roundrobin_generators to combine multiple template inclusions.
This retrieves pages in a more consecutive way.
Change-Id: Ida2f690cb85975c7f28a06e14d113eb95c453189
---
M scripts/template.py
1 file changed, 2 insertions(+), 3 deletions(-)
Approvals:
JJMC89: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/template.py b/scripts/template.py
index be3b61c..7a3a33b 100755
--- a/scripts/template.py
+++ b/scripts/template.py
@@ -110,13 +110,12 @@
# Distributed under the terms of the MIT license.
#
import re
-from itertools import chain
import pywikibot
from pywikibot import i18n, pagegenerators, textlib
from pywikibot.bot import SingleSiteBot
from pywikibot.pagegenerators import XMLDumpPageGenerator
-from pywikibot.tools import filter_unique
+from pywikibot.tools import filter_unique, roundrobin_generators
from scripts.replace import ReplaceRobot as ReplaceBot
@@ -299,7 +298,7 @@
follow_redirects=False)
for t in old_templates
)
- gen = chain(*gens)
+ gen = roundrobin_generators(*gens)
gen = filter_unique(gen, key=lambda p: '{}:{}:{}'.format(*p._cmpkey()))
if user:
gen = pagegenerators.UserEditFilterGenerator(gen, user, timestamp,
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/698732
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: Ida2f690cb85975c7f28a06e14d113eb95c453189
Gerrit-Change-Number: 698732
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/698731 )
Change subject: [IMPR] Simplify creating a list of templates
......................................................................
[IMPR] Simplify creating a list of templates
Change-Id: I97311c71a103b9ae26364140bd2d8b203c59a3be
---
M scripts/template.py
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
JJMC89: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/template.py b/scripts/template.py
index be3b61c..3289534 100755
--- a/scripts/template.py
+++ b/scripts/template.py
@@ -279,10 +279,8 @@
'you must give an even number of template names.')
return
- old_templates = []
- for template_name in templates:
- old_template = pywikibot.Page(site, template_name, ns=10)
- old_templates.append(old_template)
+ old_templates = [pywikibot.Page(site, template_name, ns=10)
+ for template_name in templates]
if xmlfilename:
builder = textlib.MultiTemplateMatchBuilder(site)
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/698731
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: I97311c71a103b9ae26364140bd2d8b203c59a3be
Gerrit-Change-Number: 698731
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
Gerrit-MessageType: merged