jenkins-bot has submitted this change and it was merged.
Change subject: [doc] Add FileInfo to the list of included objects.
......................................................................
[doc] Add FileInfo to the list of included objects.
Also sort list by class occurence.
Change-Id: I96ea48976c8c02d08b67f9d3383b5f811986dbb6
---
M pywikibot/page.py
1 file changed, 3 insertions(+), 2 deletions(-)
Approvals:
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/page.py b/pywikibot/page.py
index 16a69d0..f89a1d9 100644
--- a/pywikibot/page.py
+++ b/pywikibot/page.py
@@ -3,10 +3,11 @@
Objects representing various types of MediaWiki, including Wikibase, pages.
This module also includes objects:
-* Link: an internal or interwiki link in wikitext.
-* Revision: a single change to a wiki page.
* Property: a type of semantic data.
* Claim: an instance of a semantic assertion.
+* Revision: a single change to a wiki page.
+* FileInfo: a structure holding imageinfo of latest rev. of FilePage
+* Link: an internal or interwiki link in wikitext.
"""
#
--
To view, visit https://gerrit.wikimedia.org/r/216522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I96ea48976c8c02d08b67f9d3383b5f811986dbb6
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: Skip RC entries without a title
......................................................................
Skip RC entries without a title
The title in a log entry may have been suppressed,
and wont appear in the item data.
Bug: T78152
Change-Id: I2b27813eb2b6861d606177f69d2eefa813c0cbd0
---
M pywikibot/pagegenerators.py
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 12e7523..dd96d21 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -994,6 +994,9 @@
showPatrolled=showPatrolled,
topOnly=topOnly, step=step, total=total,
user=user, excludeuser=excludeuser):
+ # The title in a log entry may have been suppressed
+ if 'title' not in item and item['type'] == 'log':
+ continue
yield pywikibot.Page(pywikibot.Link(item["title"], site))
@@ -2047,6 +2050,9 @@
from pywikibot.comms.rcstream import site_rc_listener
for entry in site_rc_listener(site, total=total):
+ # The title in a log entry may have been suppressed
+ if 'title' not in entry and entry['type'] == 'log':
+ continue
page = pywikibot.Page(site, entry['title'], entry['namespace'])
page._rcinfo = entry
yield page
--
To view, visit https://gerrit.wikimedia.org/r/216413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b27813eb2b6861d606177f69d2eefa813c0cbd0
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>
jenkins-bot has submitted this change and it was merged.
Change subject: Deadlock problem fixed by using requests
......................................................................
Deadlock problem fixed by using requests
Bug: T71781
Change-Id: Iae9454cc0c7d4c815b2d9def7a8510d9d38f24e3
---
M scripts/makecat.py
M tests/script_tests.py
2 files changed, 3 insertions(+), 16 deletions(-)
Approvals:
John Vandenberg: Looks good to me, but someone else must approve
XZise: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/makecat.py b/scripts/makecat.py
index b2885f5..d1a80f9 100755
--- a/scripts/makecat.py
+++ b/scripts/makecat.py
@@ -194,7 +194,7 @@
main = True
workingcatname = ''
tocheck = DequeGenerator()
- for arg in pywikibot.handleArgs():
+ for arg in pywikibot.handle_args():
if arg.startswith('-nodate'):
skipdates = True
elif arg.startswith('-forward'):
diff --git a/tests/script_tests.py b/tests/script_tests.py
index bf11a8b..f93d126 100644
--- a/tests/script_tests.py
+++ b/tests/script_tests.py
@@ -66,10 +66,6 @@
'script_wui', # depends on lua compiling
]
-deadlock_script_list = [
- 'makecat', # bug 69781
-]
-
script_list = (['login'] +
[name[0:-3] for name in os.listdir(scripts_path) # strip '.py'
if name.endswith('.py') and
@@ -173,10 +169,6 @@
# cause the loader to fallback to its own
# discover() ordering of unit tests.
- if deadlock_script_list:
- print('Skipping deadlock scripts:\n %s'
- % ', '.join(deadlock_script_list))
-
if unrunnable_script_list:
print('Skipping execution of unrunnable scripts:\n %r'
% unrunnable_script_list)
@@ -189,14 +181,12 @@
tests = (['test__login_help'] +
['test_' + name + '_help'
for name in sorted(script_list)
- if name != 'login' and
- name not in deadlock_script_list] +
+ if name != 'login'] +
['test__login_simulate'])
tests += ['test_' + name + '_simulate'
for name in sorted(script_list)
if name != 'login' and
- name not in deadlock_script_list and
name not in failed_dep_script_list and
name not in unrunnable_script_list and
(enable_autorun_tests or name not in auto_run_script_list)]
@@ -343,9 +333,6 @@
# TODO: after bug 68611 and 68664 (and makecat), split -help
# execution to a separate test class which uses site=False.
- if script_name in deadlock_script_list:
- dct[test_name].__test__ = False
-
if script_name == 'login':
test_name = 'test__' + script_name + '_simulate'
else:
@@ -372,7 +359,7 @@
dct[test_name].__name__ = test_name
# Disable test by default in nosetests
- if script_name in unrunnable_script_list + deadlock_script_list:
+ if script_name in unrunnable_script_list:
dct[test_name].__test__ = False
# TODO: Ideally any script not on the auto_run_script_list
--
To view, visit https://gerrit.wikimedia.org/r/216407
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae9454cc0c7d4c815b2d9def7a8510d9d38f24e3
Gerrit-PatchSet: 2
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com>
Gerrit-Reviewer: Ladsgroup <ladsgroup(a)gmail.com>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
Gerrit-Reviewer: XZise <CommodoreFabianus(a)gmx.de>
Gerrit-Reviewer: jenkins-bot <>