jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/487067 )
Change subject: [bugfix] Fix for loop in copyAndKeep()
......................................................................
[bugfix] Fix for loop in copyAndKeep()
As pointed out in https://gerrit.wikimedia.org/r/#/c/pywikibot/core/+/487054/,
the for loop is broken here since
https://phabricator.wikimedia.org/rPWBO53135d55c341278bb6844183701bc78afe12…
in compat was merged. In compat this bug was fixed in 2008, but I suspect
the copyAndKeep method isn't used in core anymore as this bug never showed up.
Change-Id: I589c17af428c48f5ab0e69c5ecc468441a0ef1cc
---
M pywikibot/page.py
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
Zhuyifei1999: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 9b6eb22..1718e08 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -3045,9 +3045,9 @@
authors = ', '.join(self.contributingUsers())
creation_summary = message % (self.title(), authors)
newtext = self.get()
- for regex_name in cfd_templates:
- matchcfd = re.compile(r'{{%s.*?}}' % regex_name, re.IGNORECASE)
- newtext = matchcfd.sub('', newtext)
+ for regex_name in cfd_templates:
+ matchcfd = re.compile(r'{{%s.*?}}' % regex_name, re.IGNORECASE)
+ newtext = matchcfd.sub('', newtext)
matchcomment = re.compile(
r'<!--BEGIN CFD TEMPLATE-->.*?<!--END CFD TEMPLATE-->',
re.IGNORECASE | re.MULTILINE | re.DOTALL)
--
To view, visit https://gerrit.wikimedia.org/r/487067
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I589c17af428c48f5ab0e69c5ecc468441a0ef1cc
Gerrit-Change-Number: 487067
Gerrit-PatchSet: 4
Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/485484 )
Change subject: [tests] Fix api_tests for wikia
......................................................................
[tests] Fix api_tests for wikia
- The warning message has been change.
Check for "API warning (paraminfo): " only
- skip test_valid_lagpattern
if 'dbrepllag' is not in siteinfo
Bug: T214009
Change-Id: I1a04c5d227b30315ef946f392b937ce6393f81c7
---
M tests/api_tests.py
1 file changed, 6 insertions(+), 11 deletions(-)
Approvals:
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/api_tests.py b/tests/api_tests.py
index 24464ff..d075dde 100644
--- a/tests/api_tests.py
+++ b/tests/api_tests.py
@@ -357,11 +357,8 @@
pi.fetch('foobar')
self.assertRaises(KeyError, pi.__getitem__, 'foobar')
self.assertRaises(KeyError, pi.__getitem__, 'foobar+foobar')
- # The warning message does not end with a '.' in older MW versions.
- self.assertIn(
- 'API warning (paraminfo): '
- 'The module "main" does not have a submodule "foobar"',
- w.call_args[0][0])
+ # The warning message may be different with older MW versions.
+ self.assertIn('API warning (paraminfo): ', w.call_args[0][0])
self.assertNotIn('foobar', pi._paraminfo)
self.assertIn('main', pi._paraminfo)
@@ -389,11 +386,8 @@
with patch.object(pywikibot, 'warning') as w:
self.assertRaises(KeyError, pi.__getitem__, 'query+foobar')
- # The warning message does not end with a '.' in older MW versions.
- self.assertIn(
- 'API warning (paraminfo): '
- 'The module "query" does not have a submodule "foobar"',
- w.call_args[0][0])
+ # The warning message may be different with older MW versions.
+ self.assertIn('API warning (paraminfo): ', w.call_args[0][0])
self.assertRaises(KeyError, pi.submodules, 'edit')
@@ -1129,7 +1123,8 @@
def test_valid_lagpattern(self):
"""Test whether api.lagpattern is valid."""
mysite = self.get_site()
- if mysite.siteinfo['dbrepllag'][0]['lag'] == -1:
+ if ('dbrepllag' not in mysite.siteinfo
+ or mysite.siteinfo['dbrepllag'][0]['lag'] == -1):
raise unittest.SkipTest(
'{0} is not running on a replicated database cluster.'
.format(mysite)
--
To view, visit https://gerrit.wikimedia.org/r/485484
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I1a04c5d227b30315ef946f392b937ce6393f81c7
Gerrit-Change-Number: 485484
Gerrit-PatchSet: 6
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/485485 )
Change subject: [tests] Skip test_pages_with_property_generator test for wikia
......................................................................
[tests] Skip test_pages_with_property_generator test for wikia
wikia has mw version 1.19 but 1.21+ is needed for Propery generator.
Skip this test for wikia.
Bug: T214009
Change-Id: I3cef33a0b11a170c700b187aa791a5cbd411cf98
---
M tests/pagegenerators_tests.py
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
D3r1ck01: Looks good to me, but someone else must approve
Dalba: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index 57b1e15..110c769 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -2,7 +2,7 @@
# -*- coding: utf-8 -*-
"""Test pagegenerators module."""
#
-# (C) Pywikibot team, 2009-2018
+# (C) Pywikibot team, 2009-2019
#
# Distributed under the terms of the MIT license.
from __future__ import absolute_import, division, unicode_literals
@@ -1135,6 +1135,8 @@
def test_pages_with_property_generator(self):
"""Test the pages_with_property_generator method."""
mysite = self.get_site()
+ if mysite.mw_version < '1.21':
+ raise unittest.SkipTest('requires v1.21+')
for item in ('defaultsort', 'disambiguation', 'displaytitle',
'hiddencat', 'invalid_property'):
if item in mysite.get_property_names():
--
To view, visit https://gerrit.wikimedia.org/r/485485
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I3cef33a0b11a170c700b187aa791a5cbd411cf98
Gerrit-Change-Number: 485485
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com>
Gerrit-Reviewer: jenkins-bot (75)
Gerrit-CC: Dvorapa <dvorapa(a)seznam.cz>
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/486729 )
Change subject: [FIX] Fix comparison of str, bytes and int literal with ==/!=
......................................................................
[FIX] Fix comparison of str, bytes and int literal with ==/!=
Caught this recently;
* 08:33:23 ./pywikibot/tools/__init__.py:1865: use ==/!= to compare
str, bytes, and int literals
* 08:33:23 ./pywikibot/pagegenerators.py:1203: use ==/!= to compare
str, bytes, and int literals
while reviewing change: I8a3ea71150938a502f91c1d29f5e2ee0dbc7d10d.
This is unrelated to the change but seems like a call for concern?
Failures are caused by the use of the keyword "is" instead of "==" or
"!=".
Change-Id: I8883786e5e5b148a73cfa436436b7384f5fa4bcf
---
M pywikibot/pagegenerators.py
M pywikibot/tools/__init__.py
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Framawiki: Looks good to me, approved
Dvorapa: Looks good to me, but someone else must approve
Xqt: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 9555c39..227cc41 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -1200,7 +1200,7 @@
def _int_none(v):
"""Return None if v is None or '' else return int(v)."""
- return v if (v is None or v is '') else int(v)
+ return v if (v is None or v == '') else int(v)
@deprecated('Site.allpages()', since='20180512')
diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index 6888440..7aa8a31 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -1862,7 +1862,7 @@
target_module = target.__module__
if target_module and target_module[-1] != '.':
target_module += '.'
- if source_module is '.':
+ if source_module == '.':
source_module = target_module
elif source_module and source_module[-1] != '.':
source_module += '.'
--
To view, visit https://gerrit.wikimedia.org/r/486729
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I8883786e5e5b148a73cfa436436b7384f5fa4bcf
Gerrit-Change-Number: 486729
Gerrit-PatchSet: 3
Gerrit-Owner: D3r1ck01 <alangiderick(a)gmail.com>
Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)