jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/495172 )
Change subject: [bugfix] Remove test for 'id' in rcinfo.keys()
......................................................................
[bugfix] Remove test for 'id' in rcinfo.keys()
It is not safe that rcinfo contains this key
Bug: T217877
Change-Id: I7ac1830fb32b5557a5a455a3e322a23048052d0c
---
M tests/pagegenerators_tests.py
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
D3r1ck01: Looks good to me, but someone else must approve
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index 7440e6a..041ebcf 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -1582,7 +1582,7 @@
self.assertEqual(rcinfo['server_name'], site.hostname())
self.assertEqual(rcinfo['wiki'], site.dbName())
- for key in ['id', 'type', 'namespace', 'title', 'comment',
+ for key in ['type', 'namespace', 'title', 'comment',
'timestamp', 'user', 'bot']:
self.assertIn(key, rcinfo.keys())
--
To view, visit https://gerrit.wikimedia.org/r/495172
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: I7ac1830fb32b5557a5a455a3e322a23048052d0c
Gerrit-Change-Number: 495172
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com>
Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/505636 )
Change subject: [IMPR] Print the uri in error_handling_callback
......................................................................
[IMPR] Print the uri in error_handling_callback
- Print the called uri in error_handling_callback when the request
fails with an exception.
- remove print_function import which is not in this module
Change-Id: If5a7d8b3db1c442212367fcdb75fd2824826885f
---
M pywikibot/comms/http.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Framawiki: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py
index fc1a990..fb11106 100644
--- a/pywikibot/comms/http.py
+++ b/pywikibot/comms/http.py
@@ -16,8 +16,7 @@
#
# Distributed under the terms of the MIT license.
#
-from __future__ import (absolute_import, division,
- print_function, unicode_literals)
+from __future__ import absolute_import, division, unicode_literals
__docformat__ = 'epytext'
@@ -409,6 +408,7 @@
# if all else fails
if isinstance(request.data, Exception):
+ error('An error occurred for uri ' + request.uri)
raise request.data
if request.status == 504:
--
To view, visit https://gerrit.wikimedia.org/r/505636
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: If5a7d8b3db1c442212367fcdb75fd2824826885f
Gerrit-Change-Number: 505636
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
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/502192 )
Change subject: [tests] Skip some tests for wpbeta and wsbeta
......................................................................
[tests] Skip some tests for wpbeta and wsbeta
Skip test_recentchanges_default method of
pagegenerators_tests.TestFactoryGenerator due to too
many autoblocked users. Tests fails for a long time.
Bug: T219780
Change-Id: I24be60fea1799dbb709dee8ec5bdca1e7da1b500
---
M tests/pagegenerators_tests.py
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
D3r1ck01: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py
index b7c622f..6af2673 100755
--- a/tests/pagegenerators_tests.py
+++ b/tests/pagegenerators_tests.py
@@ -1015,6 +1015,9 @@
def test_recentchanges_default(self):
"""Test recentchanges generator with default namespace setting."""
+ if self.site.family.name in ('wpbeta', 'wsbeta'):
+ self.skipTest('Skipping {} due to too many autoblocked users'
+ .format(self.site))
gf = pagegenerators.GeneratorFactory(site=self.site)
gf.handleArg('-recentchanges:50')
gen = gf.getCombinedGenerator()
--
To view, visit https://gerrit.wikimedia.org/r/502192
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: I24be60fea1799dbb709dee8ec5bdca1e7da1b500
Gerrit-Change-Number: 502192
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.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: 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/505456 )
Change subject: [cleanup] Remove wikiapiary from family_file dictionary
......................................................................
[cleanup] Remove wikiapiary from family_file dictionary
- wikiapiary.com is no longer available and was never used for tests.
Remove their registration; see https://meta.wikimedia.org/wiki/Interwiki_map
- Update doc string for register_family_file.
Change-Id: Idc5bfceb08763b7023000d49587b4d91520b5a46
---
M pywikibot/config2.py
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
Dvorapa: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/config2.py b/pywikibot/config2.py
index 78afa27..e155e60 100644
--- a/pywikibot/config2.py
+++ b/pywikibot/config2.py
@@ -399,7 +399,11 @@
def register_family_file(family_name, file_path):
- """Register a single family class file."""
+ """Register a single family class file.
+
+ Parameter file_path may be a path or an url.
+ family.AutoFamily function is used when the url is given.
+ """
usernames[family_name] = {}
sysopnames[family_name] = {}
disambiguation_comment[family_name] = {}
@@ -418,7 +422,6 @@
# Get the names of all known families, and initialize with empty dictionaries.
# ‘families/’ is a subdirectory of the directory in which config2.py is found.
register_families_folder(os.path.join(os.path.dirname(__file__), 'families'))
-register_family_file('wikiapiary', 'https://wikiapiary.com')
# Set to True to override the {{bots}} exclusion protocol (at your own risk!)
ignore_bot_templates = False
--
To view, visit https://gerrit.wikimedia.org/r/505456
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: Idc5bfceb08763b7023000d49587b4d91520b5a46
Gerrit-Change-Number: 505456
Gerrit-PatchSet: 3
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot (75)
Gerrit-CC: Framawiki <framawiki(a)tools.wmflabs.org>