jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/810447 )
Change subject: [doc] Update documentation
......................................................................
[doc] Update documentation
Change-Id: I1f1c1c74650d278377d447b3569bf9aaeca8d1fc
---
M pywikibot/bot.py
M pywikibot/cosmetic_changes.py
M pywikibot/data/api/_generators.py
M pywikibot/diff.py
M pywikibot/page/_filepage.py
M pywikibot/page/_pages.py
M pywikibot/pagegenerators.py
M pywikibot/scripts/login.py
M pywikibot/site/_datasite.py
M pywikibot/site/_siteinfo.py
M pywikibot/site/_upload.py
M pywikibot/tools/__init__.py
M scripts/data_ingestion.py
M scripts/harvest_template.py
M scripts/welcome.py
M tests/site_tests.py
M tests/thanks_tests.py
17 files changed, 90 insertions(+), 73 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 012319f..f401d96 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -2257,7 +2257,8 @@
Before adding a new claim, it checks if we can add it, using provided
filters.
- :see: documentation of :py:obj:`claimit.py<scripts.claimit>`
+ ..seealso:: documentation of :py:obj:`claimit.py<scripts.claimit>`
+
:param exists_arg: pattern for merging existing claims with new ones
:param logger_callback: function logging the output of the method
:return: whether the claim could be added
diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py
index 54e1ccb..5f06e80 100644
--- a/pywikibot/cosmetic_changes.py
+++ b/pywikibot/cosmetic_changes.py
@@ -748,11 +748,11 @@
== Section title ==
- :NOTE: This space is recommended in the syntax help on the
- English and German Wikipedias. It is not wanted on Lojban and
- English Wiktionaries (T168399, T169064) and it might be that
- it is not wanted on other wikis. If there are any complaints,
- please file a bug report.
+ .. note:: This space is recommended in the syntax help on the
+ English and German Wikipedias. It is not wanted on Lojban and
+ English Wiktionaries (:phab:`T168399`, :phab:`T169064`) and
+ it might be that it is not wanted on other wikis. If there
+ are any complaints, please file a bug report.
"""
if self.site.sitename in ['wiktionary:jbo', 'wiktionary:en']:
return text
@@ -766,10 +766,10 @@
"""
Add a space between the * or # and the text.
- :NOTE: This space is recommended in the syntax help on the
- English, German and French Wikipedias. It might be that it
- is not wanted on other wikis. If there are any complaints,
- please file a bug report.
+ .. note:: This space is recommended in the syntax help on the
+ English, German and French Wikipedias. It might be that it
+ is not wanted on other wikis. If there are any complaints,
+ please file a bug report.
"""
if not self.template:
exceptions = ['comment', 'math', 'nowiki', 'pre',
diff --git a/pywikibot/data/api/_generators.py b/pywikibot/data/api/_generators.py
index e2b4a10..04fe660 100644
--- a/pywikibot/data/api/_generators.py
+++ b/pywikibot/data/api/_generators.py
@@ -384,9 +384,9 @@
def support_namespace(self) -> bool:
"""Check if namespace is a supported parameter on this query.
- Note: this function will be removed when self.set_namespace() will
- throw TypeError() instead of just giving a warning.
- See T196619.
+ .. note:: this function will be removed when
+ :meth:`set_namespace` will throw TypeError() instead of just
+ giving a warning. See :phab:`T196619`.
:return: True if yes, False otherwise
"""
diff --git a/pywikibot/diff.py b/pywikibot/diff.py
index d67a8b9..9c94077 100644
--- a/pywikibot/diff.py
+++ b/pywikibot/diff.py
@@ -22,7 +22,8 @@
"""One change hunk between a and b.
- Note: parts of this code are taken from by difflib.get_grouped_opcodes().
+ .. note:: parts of this code are taken from by
+ `difflib.get_grouped_opcodes()`.
"""
diff --git a/pywikibot/page/_filepage.py b/pywikibot/page/_filepage.py
index 0e61412..c8983a9 100644
--- a/pywikibot/page/_filepage.py
+++ b/pywikibot/page/_filepage.py
@@ -239,9 +239,11 @@
codes for which an equivalent callable would return True if all
UploadError codes are in thet list. If the result is False it'll
not continue uploading the file and otherwise disable any warning
- and reattempt to upload the file. NOTE: If report_success is True
- or None it'll raise an UploadError exception if the static
- boolean is False.
+ and reattempt to upload the file.
+
+ .. note:: NOTE: If report_success is True or None it'll
+ raise an UploadError exception if the static boolean is
+ False.
:type ignore_warnings: bool or callable or iterable of str
:keyword chunk_size: The chunk size in bytesfor chunked
uploading (see :api:`Upload#Chunked_uploading`). It will
diff --git a/pywikibot/page/_pages.py b/pywikibot/page/_pages.py
index 2021b09..1ddeba3 100644
--- a/pywikibot/page/_pages.py
+++ b/pywikibot/page/_pages.py
@@ -2543,7 +2543,10 @@
"""
return self.site.categoryinfo(self)
- def newest_pages(self, total=None):
+ def newest_pages(
+ self,
+ total: Optional[int] = None
+ ) -> Generator[Page, None, None]:
"""
Return pages in a category ordered by the creation date.
@@ -2560,12 +2563,12 @@
checked).
:param total: The total number of pages queried.
- :type total: int
:return: A page generator of all pages in a category ordered by the
- creation date. From newest to oldest. Note: It currently only
- returns Page instances and not a subclass of it if possible. This
- might change so don't expect to only get Page instances.
- :rtype: generator
+ creation date. From newest to oldest.
+
+ .. note:: It currently only returns Page instances and not a
+ subclass of it if possible. This might change so don't
+ expect to only get Page instances.
"""
def check_cache(latest):
"""Return the cached pages in order and not more than total."""
diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py
index 3450499..10ac283 100644
--- a/pywikibot/pagegenerators.py
+++ b/pywikibot/pagegenerators.py
@@ -110,22 +110,22 @@
across all namespaces.
-logevents Work on articles that were on a specified Special:Log.
- The value may be a comma separated list of these values:
+ The value may be a comma separated list of these values::
logevent,username,start,end
- or for backward compatibility:
+ or for backward compatibility::
logevent,username,total
- Note: 'start' is the most recent date and log events are
- iterated from present to past. If 'start'' is not provided,
- it means 'now'; if 'end' is not provided, it means 'since
- the beginning'.
+ .. note:: 'start' is the most recent date and log
+ events are iterated from present to past. If
+ 'start' is not provided, it means 'now'; if 'end'
+ is not provided, it means 'since the beginning'.
To use the default value, use an empty string.
You have options for every type of logs given by the
- log event parameter which could be one of the following:
+ log event parameter which could be one of the following::
spamblacklist, titleblacklist, gblblock, renameuser,
globalauth, gblrights, gblrename, abusefilter,
@@ -251,7 +251,7 @@
and works on the resulting pages.
-sparqlendpoint Specify SPARQL endpoint URL (optional).
- (Example : -sparqlendpoint:http://myserver.com/sparql)
+ (Example: -sparqlendpoint:http://myserver.com/sparql)
-searchitem Takes a search string and works on Wikibase pages that
contain it.
@@ -350,14 +350,14 @@
-namespace specified namespaces. Separate multiple namespace
-ns numbers or names with commas.
- Examples:
+ Examples::
-ns:0,2,4
-ns:Help,MediaWiki
You may use a preleading "not" to exclude the namespace.
- Examples:
+ Examples::
-ns:not:2,3
-ns:not:Help,File
@@ -378,19 +378,23 @@
Examples:
- P1=Q2 (property P1 must contain value Q2),
- P3=Q4,P5=Q6,P6=Q7 (property P3 with value Q4 and
- qualifiers: P5 with value Q6 and P6 with value Q7).
+ .. code-block:: shell
+
+ P1=Q2 (property P1 must contain value Q2),
+ P3=Q4,P5=Q6,P6=Q7 (property P3 with value Q4 and
+ qualifiers: P5 with value Q6 and P6 with value Q7).
+
Value can be page ID, coordinate in format:
latitude,longitude[,precision] (all values are in decimal
degrees), year, or plain string.
+
The argument can be provided multiple times and the item
page will be returned only if all claims are present.
Argument can be also given as "-onlyif:expression".
--onlyifnot A claim the page must not contain, otherwise the item won't
- be returned.
- For usage and examples, see -onlyif above.
+-onlyifnot A claim the page must not contain, otherwise the
+ item won't be returned. For usage and examples, see
+ `-onlyif` above.
-ql Filter pages based on page quality.
This is only applicable if contentmodel equals
@@ -1743,13 +1747,13 @@
return gen
-def NamespaceFilterPageGenerator(generator: Iterable['pywikibot.page.Page'],
- namespaces: Union[
- FrozenSet['pywikibot.site.Namespace'],
- NAMESPACE_OR_STR_TYPE,
- Sequence[NAMESPACE_OR_STR_TYPE]],
- site: OPT_SITE_TYPE = None
- ) -> Iterator['pywikibot.page.Page']:
+def NamespaceFilterPageGenerator(
+ generator: Iterable['pywikibot.page.Page'],
+ namespaces: Union[FrozenSet['pywikibot.site.Namespace'],
+ NAMESPACE_OR_STR_TYPE,
+ Sequence[NAMESPACE_OR_STR_TYPE]],
+ site: OPT_SITE_TYPE = None
+) -> Iterator['pywikibot.page.Page']:
"""
A generator yielding pages from another generator in given namespaces.
@@ -1757,8 +1761,8 @@
of that site, otherwise the namespaces are validated using the default
site.
- NOTE: API-based generators that have a "namespaces" parameter perform
- namespace filtering more efficiently than this generator.
+ .. note:: API-based generators that have a "namespaces" parameter
+ perform namespace filtering more efficiently than this generator.
:param namespaces: list of namespace identifiers to limit results
:param site: Site for generator results; mandatory if
@@ -1977,8 +1981,9 @@
Uses regex option re.IGNORECASE depending on the quantifier parameter.
If ignore_namespace is False, the whole page title is compared.
- NOTE: if you want to check for a match at the beginning of the title,
- you have to start the regex with "^"
+
+ .. note:: if you want to check for a match at the beginning of
+ the title, you have to start the regex with "^"
:param generator: another generator
:param regex: a regex which should match the page title
diff --git a/pywikibot/scripts/login.py b/pywikibot/scripts/login.py
index b4627c2..e45273b 100755
--- a/pywikibot/scripts/login.py
+++ b/pywikibot/scripts/login.py
@@ -21,11 +21,14 @@
site.
-oauth Generate OAuth authentication information.
- NOTE: Need to copy OAuth tokens to your user-config.py
- manually. -logout is not compatible with -oauth.
+
+ .. note:: Need to copy OAuth tokens to your user-config.py
+ manually. -logout is not compatible with -oauth.
-autocreate Auto-create an account using unified login when necessary.
- Note: the global account must exist already before using this.
+
+ .. note:: the global account must exist already before
+ using this.
If not given as parameter, the script will ask for your username and
password (password entry will be hidden), log in to your home wiki using
diff --git a/pywikibot/site/_datasite.py b/pywikibot/site/_datasite.py
index a3e2215..5375cc7 100644
--- a/pywikibot/site/_datasite.py
+++ b/pywikibot/site/_datasite.py
@@ -247,11 +247,11 @@
@need_right('edit')
def editEntity(self, entity, data, bot: bool = True, **kwargs):
- """
- Edit entity.
+ """Edit entity.
- Note: This method is unable to create entities other than 'item'
- if dict with API parameters was passed to 'entity' parameter.
+ .. note:: This method is unable to create entities other than
+ 'item' if dict with API parameters was passed to 'entity'
+ parameter.
:param entity: Page to edit, or dict with API parameters
to use for entity identification
diff --git a/pywikibot/site/_siteinfo.py b/pywikibot/site/_siteinfo.py
index 92d2563..00e90f6 100644
--- a/pywikibot/site/_siteinfo.py
+++ b/pywikibot/site/_siteinfo.py
@@ -265,6 +265,8 @@
It will never throw an APIError if it only stated, that the siteinfo
property doesn't exist. Instead it will use the default value.
+ .. seealso:: :py:obj:`_get_siteinfo`
+
:param key: The name of the siteinfo property.
:param get_default: Whether to throw an KeyError if the key is invalid.
:param cache: Caches the result internally so that future accesses via
@@ -274,7 +276,6 @@
:return: The gathered property
:raises KeyError: If the key is not a valid siteinfo property and the
get_default option is set to False.
- :see: :py:obj:`_get_siteinfo`
"""
# If expiry is True, convert it to 0 to be coherent with
# _get_siteinfo() and _get_general() docstring.
diff --git a/pywikibot/site/_upload.py b/pywikibot/site/_upload.py
index ad4af5a..c91e689 100644
--- a/pywikibot/site/_upload.py
+++ b/pywikibot/site/_upload.py
@@ -51,9 +51,10 @@
codes for which an equivalent callable would return True if all
UploadError codes are in thet list. If the result is False it'll
not continue uploading the file and otherwise disable any warning
- and reattempt to upload the file. NOTE: If report_success is True
- or None it'll raise an UploadError exception if the static
- boolean is False.
+ and reattempt to upload the file.
+
+ .. note:: If report_success is True or None it'll raise an
+ UploadError exception if the static boolean is False.
:type ignore_warnings: bool or callable or iterable of str
:param report_success: If the upload was successful it'll print a
success message and if ignore_warnings is set to False it'll
diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py
index 9bc7ad0..92786ba 100644
--- a/pywikibot/tools/__init__.py
+++ b/pywikibot/tools/__init__.py
@@ -978,7 +978,7 @@
Beware that key=id is only useful for cases where id() is not unique.
- Note: This is not thread safe.
+ .. warning:: This is not thread safe.
.. versionadded: 3.0
diff --git a/scripts/data_ingestion.py b/scripts/data_ingestion.py
index ac83770..802cf05 100755
--- a/scripts/data_ingestion.py
+++ b/scripts/data_ingestion.py
@@ -172,8 +172,8 @@
"""
Populate format string with %(name)s entries using metadata.
- Note: this does not clean the title, so it may be unusable as
- a MediaWiki page title, and cause an API exception when used.
+ .. note:: this does not clean the title, so it may be unusable as
+ a MediaWiki page title, and cause an API exception when used.
:param fmt: format string
:return: formatted string
diff --git a/scripts/harvest_template.py b/scripts/harvest_template.py
index 38d58f9..c1df570 100755
--- a/scripts/harvest_template.py
+++ b/scripts/harvest_template.py
@@ -243,7 +243,7 @@
"""
Compare bot's (global) and provided (local) options.
- :see: :py:obj:`OptionHandler`
+ .. seealso:: :class:`OptionHandler`
"""
default = self.opt[option]
local = handler.opt[option]
diff --git a/scripts/welcome.py b/scripts/welcome.py
index 14b1573..b1f3feb 100755
--- a/scripts/welcome.py
+++ b/scripts/welcome.py
@@ -139,8 +139,8 @@
* [[User:Rock|Rock]]
</pre>
-NOTE: The white space and <pre></pre> aren't required but I suggest you to
- use them.
+.. note:: The white space and <pre></pre> aren't required but I suggest
+ you to use them.
******************************** Badwords **********************************
diff --git a/tests/site_tests.py b/tests/site_tests.py
index ec46674..c4c209e 100755
--- a/tests/site_tests.py
+++ b/tests/site_tests.py
@@ -1060,9 +1060,9 @@
If there are no images included in main page it'll skip all tests.
- Note: This is not implemented as setUpClass which would be invoked
- while initialising all tests, to reduce chance of an error preventing
- all tests from running.
+ .. note:: This is not implemented as setUpClass which would be
+ invoked while initialising all tests, to reduce chance of an
+ error preventing all tests from running.
"""
if hasattr(self.__class__, '_image_page'):
return self.__class__._image_page
diff --git a/tests/thanks_tests.py b/tests/thanks_tests.py
index c7a1422..137d1e0 100755
--- a/tests/thanks_tests.py
+++ b/tests/thanks_tests.py
@@ -28,9 +28,9 @@
def test_thank_revision(self):
"""Test thanks for normal revisions.
- NOTE: This test relies on activity in recentchanges, and
- there must make edits made before reruns of this test.
- Please see https://phabricator.wikimedia.org/T137836.
+ .. note:: This test relies on activity in recentchanges, and
+ there must make edits made before reruns of this test.
+ .. seealso:: :phab:`T137836`.
"""
site = self.get_site()
data = site.recentchanges(total=20)
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/810447
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: I1f1c1c74650d278377d447b3569bf9aaeca8d1fc
Gerrit-Change-Number: 810447
Gerrit-PatchSet: 2
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.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/+/810417 )
Change subject: [IMPR] Documentation updates and improvements
......................................................................
[IMPR] Documentation updates and improvements
- add sphinx doc for class attributes
- add type for keyword argument 'site'
- '<<default>>' at the end of a string can be omitted
- pywikibot.info() or pywikibot.output() without any argument prints
a newline
Change-Id: Ia7a6186a1ce6226f6ac5fe4a61d90a5cfd8b111f
---
M scripts/speedy_delete.py
1 file changed, 19 insertions(+), 19 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scripts/speedy_delete.py b/scripts/speedy_delete.py
index 7271e84..272b5f7 100755
--- a/scripts/speedy_delete.py
+++ b/scripts/speedy_delete.py
@@ -13,12 +13,13 @@
text is long, to prevent terminal spamming, it might be a good idea to truncate
it just to the first so many bytes.
-WARNING: This tool shows the contents of the top revision only. It is possible
-that a vandal has replaced a perfectly good article with nonsense, which has
-subsequently been tagged by someone who didn't realize it was previously a good
-article. The onus is on you to avoid making these mistakes.
+.. warning:: This tool shows the contents of the top revision only. It
+ is possible that a vandal has replaced a perfectly good article with
+ nonsense, which has subsequently been tagged by someone who didn't
+ realize it was previously a good article. The onus is on you to avoid
+ making these mistakes.
-NOTE: This script currently only works for the Wikipedia project.
+.. note:: This script currently only works for the Wikipedia project.
"""
#
# (C) Pywikibot team, 2007-2022
@@ -42,7 +43,7 @@
prompt to decide whether each should be deleted or not.
"""
- LINES = 22
+ LINES = 22 #: maximum lines to extract from wiki page
csd_cat_item = 'Q5964'
@@ -56,9 +57,9 @@
'incubator': {'incubator': 'Category:Maintenance:Delete'},
}
- # If the site has several templates for speedy deletion, it might be
- # possible to find out the reason for deletion by the template used.
- # _default will be used if no such semantic template was used.
+ #: If the site has several templates for speedy deletion, it might be
+ #: possible to find out the reason for deletion by the template used.
+ #: _default will be used if no such semantic template was used.
deletion_messages = {
'wikipedia': {
'ar': {
@@ -199,7 +200,7 @@
},
}
- # Default reason for deleting a talk page.
+ #: Default reason for deleting a talk page.
talk_deletion_msg = {
'wikipedia': {
'ar': 'صفحة نقاش يتيمة',
@@ -221,9 +222,9 @@
}
}
- # A list of often-used reasons for deletion. Shortcuts are keys, and
- # reasons are values. If the user enters a shortcut, the associated reason
- # will be used.
+ #: A list of often-used reasons for deletion. Shortcuts are keys, and
+ #: reasons are values. If the user enters a shortcut, the associated reason
+ #: will be used.
delete_reasons = {
'wikipedia': {
'de': {
@@ -322,8 +323,7 @@
def __init__(self, **kwargs) -> None:
"""Initializer.
- :keyword site: the site to work on
- :type site: pywikibot.APISite
+ :keyword pywikibot.APISite site: the site to work on
"""
super().__init__(**kwargs)
csd_cat = i18n.translate(self.site, self.csd_cat_title)
@@ -373,8 +373,8 @@
def get_reason_for_deletion(self, page):
"""Get a reason for speedy deletion from operator."""
suggested_reason = self.guess_reason_for_deletion(page)
- pywikibot.output('The suggested reason is: <<lightred>>{}<<default>>'
- .format(suggested_reason))
+ pywikibot.info('The suggested reason is: <<lightred>>{}'
+ .format(suggested_reason))
# We don't use i18n.translate() here because for some languages the
# entry is intentionally left out.
@@ -382,10 +382,10 @@
and page.site.lang in self.delete_reasons[self.site.family.name]:
local_reasons = i18n.translate(page.site.lang,
self.delete_reasons)
- pywikibot.output('')
+ pywikibot.info()
for key in sorted(local_reasons.keys()):
pywikibot.output((key + ':').ljust(8) + local_reasons[key])
- pywikibot.output('')
+ pywikibot.info()
reason = pywikibot.input(fill(
'Please enter the reason for deletion, choose a default '
'reason, or press enter for the suggested message:'))
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/810417
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: Ia7a6186a1ce6226f6ac5fe4a61d90a5cfd8b111f
Gerrit-Change-Number: 810417
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.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/+/807485 )
Change subject: [IMPR] Simplify final throttle.drop() call
......................................................................
[IMPR] Simplify final throttle.drop() call
use popitem() to get any Site instead creating a list of all values
Change-Id: Ic89ef54ab3ad182208d1779442e9c7720c9286f5
---
M pywikibot/__init__.py
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 8954930..65de1f7 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -1345,8 +1345,8 @@
page_put_queue.not_full.notify_all()
# only need one drop() call because all throttles use the same global pid
- with suppress(IndexError):
- list(_sites.values())[0].throttle.drop()
+ with suppress(KeyError):
+ _sites.popitem()[1].throttle.drop()
log('Dropped throttle(s).')
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/807485
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: Ic89ef54ab3ad182208d1779442e9c7720c9286f5
Gerrit-Change-Number: 807485
Gerrit-PatchSet: 2
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/+/807423 )
Change subject: [bugfix] Handle page_put_queue after KeyboardInterrupt
......................................................................
[bugfix] Handle page_put_queue after KeyboardInterrupt
With Python 3.9+ the _putthread thread is stopped and cannot be continued.
- Handle the page_put_queue after KeyboardInterrupt
- stop the queue if _flush is not called during atexit
Bug: T311076
Change-Id: Id7c07562e46c5e7b411e386d76ba23f4125ad0ff
---
M pywikibot/__init__.py
1 file changed, 25 insertions(+), 18 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py
index 3264486..8954930 100644
--- a/pywikibot/__init__.py
+++ b/pywikibot/__init__.py
@@ -1319,23 +1319,30 @@
'Estimated time remaining: {sec}<<default>>'
.format(num=num, sec=sec))
+ exit_queue = None
if _putthread is not threading.current_thread():
- while (_putthread.is_alive()
- and (page_put_queue.qsize() > 0
- or page_put_queue_busy.qsize() > 0)):
+ while _putthread.is_alive() and not (page_put_queue.empty()
+ and page_put_queue_busy.empty()):
try:
_putthread.join(1)
except KeyboardInterrupt:
- if input_yn('There are {} pages remaining in the queue. '
- 'Estimated time remaining: {}\nReally exit?'
- .format(*remaining()),
- default=False, automatic_quit=False):
- # delete the put queue
- with page_put_queue.mutex:
- page_put_queue.all_tasks_done.notify_all()
- page_put_queue.queue.clear()
- page_put_queue.not_full.notify_all()
- break
+ exit_queue = input_yn(
+ 'There are {} pages remaining in the queue. Estimated '
+ 'time remaining: {}\nReally exit?'.format(*remaining()),
+ default=False, automatic_quit=False)
+ break
+
+ if exit_queue is False:
+ # handle the queue when _putthread is stopped after KeyboardInterrupt
+ with suppress(KeyboardInterrupt):
+ async_manager(block=False)
+
+ if not stop:
+ # delete the put queue
+ with page_put_queue.mutex:
+ page_put_queue.all_tasks_done.notify_all()
+ page_put_queue.queue.clear()
+ page_put_queue.not_full.notify_all()
# only need one drop() call because all throttles use the same global pid
with suppress(IndexError):
@@ -1343,14 +1350,13 @@
log('Dropped throttle(s).')
-atexit.register(_flush)
-
-
# Create a separate thread for asynchronous page saves (and other requests)
-def async_manager() -> None:
+def async_manager(block=True) -> None:
"""Daemon; take requests from the queue and execute them in background."""
while True:
- (request, args, kwargs) = page_put_queue.get()
+ if not block and page_put_queue.empty():
+ break
+ (request, args, kwargs) = page_put_queue.get(block)
page_put_queue_busy.put(None)
if request is None:
break
@@ -1375,3 +1381,4 @@
_putthread = threading.Thread(target=async_manager,
name='Put-Thread', # for debugging purposes
daemon=True)
+atexit.register(_flush)
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/807423
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: Id7c07562e46c5e7b411e386d76ba23f4125ad0ff
Gerrit-Change-Number: 807423
Gerrit-PatchSet: 4
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl>
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/+/807508 )
Change subject: [IMPR] Ignore Exception when removing an 'File' namespace alias
......................................................................
[IMPR] Ignore Exception when removing an 'File' namespace alias
Change-Id: Ifa19e2b4faaa86fdb83ec90acd8d7131cecf1808
---
M pywikibot/cosmetic_changes.py
1 file changed, 8 insertions(+), 7 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py
index 522f153..7422bc5 100644
--- a/pywikibot/cosmetic_changes.py
+++ b/pywikibot/cosmetic_changes.py
@@ -55,6 +55,7 @@
# Distributed under the terms of the MIT license.
#
import re
+from contextlib import suppress
from enum import IntEnum
from typing import Any, Union
from urllib.parse import urlparse, urlunparse
@@ -403,17 +404,17 @@
if namespace == 6 and self.site.family.name == 'wikipedia':
if self.site.code in ('en', 'fr'):
# do not change "Image" on en-wiki and fr-wiki
- assert 'Image' in namespaces
- namespaces.remove('Image')
+ with suppress(ValueError):
+ namespaces.remove('Image')
if self.site.code == 'hu':
# do not change "Kép" on hu-wiki
- assert 'Kép' in namespaces
- namespaces.remove('Kép')
+ with suppress(ValueError):
+ namespaces.remove('Kép')
elif self.site.code == 'pt':
# use "Imagem" by default on pt-wiki (per T57242)
- assert 'Imagem' in namespaces
- namespaces.insert(
- 0, namespaces.pop(namespaces.index('Imagem')))
+ with suppress(ValueError):
+ namespaces.insert(
+ 0, namespaces.pop(namespaces.index('Imagem')))
# final namespace variant
final_ns = namespaces.pop(0)
if namespace in (2, 3):
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/807508
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: Ifa19e2b4faaa86fdb83ec90acd8d7131cecf1808
Gerrit-Change-Number: 807508
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/+/807501 )
Change subject: [IMPR] Simplify some code
......................................................................
[IMPR] Simplify some code
- remove keys() method if appropriate
- remove list() function if appropriate
- simplify Request documentation
Change-Id: Ie3b0968b8fe0ae75b2cd0dc27fbe13b78708d20f
---
M pywikibot/bot.py
M pywikibot/config.py
M pywikibot/cosmetic_changes.py
M pywikibot/data/api/_generators.py
M pywikibot/data/api/_paraminfo.py
M pywikibot/data/api/_requests.py
6 files changed, 25 insertions(+), 29 deletions(-)
Approvals:
Xqt: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index 3d6fb8b..012319f 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -485,8 +485,6 @@
# config file dir
log('CONFIG FILE DIR: {}'.format(pywikibot.config.base_dir))
- all_modules = sys.modules.keys()
-
# These are the main dependencies of pywikibot.
check_package_list = [
'requests',
@@ -495,7 +493,7 @@
# report all imported packages
if config.verbose_output:
- check_package_list += all_modules
+ check_package_list += sys.modules
log('PACKAGES:')
packages = version.package_versions(check_package_list)
diff --git a/pywikibot/config.py b/pywikibot/config.py
index 173ff93..5a3626a 100644
--- a/pywikibot/config.py
+++ b/pywikibot/config.py
@@ -1053,7 +1053,7 @@
_check_user_config_types(_exec_globals, _public_globals, _imports)
# Copy the user config settings into globals
-_modified = {_key for _key in _public_globals.keys()
+_modified = {_key for _key in _public_globals
if _exec_globals[_key] != globals()[_key]}
if 'user_agent_format' in _modified:
@@ -1135,7 +1135,7 @@
else:
warning('Unknown arg {} ignored'.format(_arg))
- for _name in sorted(globals().keys()):
+ for _name in sorted(globals()):
if _name[0] != '_' \
and type(globals()[_name]) not in [types.FunctionType,
types.ModuleType] \
@@ -1154,7 +1154,7 @@
output('{}={}'.format(_name, _value))
# cleanup all locally-defined variables
-for __var in list(globals().keys()):
+for __var in list(globals()):
if __var.startswith('_') and not __var.startswith('__'):
del sys.modules[__name__].__dict__[__var]
diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py
index 522f153..93c1013 100644
--- a/pywikibot/cosmetic_changes.py
+++ b/pywikibot/cosmetic_changes.py
@@ -810,8 +810,9 @@
def replace_link(match: Match[str]) -> str:
"""Create a string to replace a single link."""
replacement = '[['
- if re.match(r'(?:' + '|'.join(list(self.site.namespaces[6])
- + list(self.site.namespaces[14])) + '):',
+ if re.match(r'(?:{}):'
+ .format('|'.join((*self.site.namespaces[6],
+ *self.site.namespaces[14]))),
match.group('link')):
replacement += ':'
replacement += match.group('link')
diff --git a/pywikibot/data/api/_generators.py b/pywikibot/data/api/_generators.py
index 1510429..e2b4a10 100644
--- a/pywikibot/data/api/_generators.py
+++ b/pywikibot/data/api/_generators.py
@@ -521,7 +521,7 @@
"""Get resultdata and verify result."""
resultdata = keys = self.data['query'][self.resultkey]
if isinstance(resultdata, dict):
- keys = list(resultdata.keys())
+ keys = list(resultdata)
if 'results' in resultdata:
resultdata = resultdata['results']
elif 'pageids' in self.data['query']:
@@ -531,7 +531,7 @@
for k in self.data['query']['pageids']]
else:
resultdata = [resultdata[k]
- for k in sorted(resultdata.keys())]
+ for k in sorted(resultdata)]
pywikibot.debug('{name} received {keys}; limit={limit}'
.format(name=type(self).__name__, keys=keys,
limit=self.limit))
@@ -545,13 +545,12 @@
continue
yield result
- if isinstance(item, dict) \
- and set(self.continuekey) & set(item.keys()):
+ if isinstance(item, dict) and set(self.continuekey) & set(item):
# if we need to count elements contained in items in
# self.data["query"]["pages"], we want to count
# item[self.continuekey] (e.g. 'revisions') and not
# self.resultkey (i.e. 'pages')
- for key in set(self.continuekey) & set(item.keys()):
+ for key in set(self.continuekey) & set(item):
self._count += len(item[key])
# otherwise we proceed as usual
else:
diff --git a/pywikibot/data/api/_paraminfo.py b/pywikibot/data/api/_paraminfo.py
index 16e6406..36d5e69 100644
--- a/pywikibot/data/api/_paraminfo.py
+++ b/pywikibot/data/api/_paraminfo.py
@@ -202,7 +202,7 @@
del failed_modules[:]
yield batch
- modules = modules - set(self._paraminfo.keys())
+ modules = modules - set(self._paraminfo)
if not modules:
return
diff --git a/pywikibot/data/api/_requests.py b/pywikibot/data/api/_requests.py
index cf8eb26..f676a4f 100644
--- a/pywikibot/data/api/_requests.py
+++ b/pywikibot/data/api/_requests.py
@@ -77,18 +77,18 @@
below) get passed as commands to api.php, and can be get or set
using the dict interface. All attributes must be strings. Use an
empty string for parameters that don't require a value. For example,
- Request(action="query", titles="Foo bar", prop="info", redirects="")
+ ``Request(action="query", titles="Foo bar", prop="info", redirects="")``
corresponds to the API request
- "api.php?action=query&titles=Foo%20bar&prop=info&redirects"
+ ``api.php?action=query&titles=Foo%20bar&prop=info&redirects``
This is the lowest-level interface to the API, and can be used for any
request that a particular site's API supports. See the API documentation
(https://www.mediawiki.org/wiki/API) and site-specific settings for
details on what parameters are accepted for each request type.
- Uploading files is a special case: to upload, the parameter "mime" must
- contain a dict, and the parameter "file" must be set equal to a valid
- filename on the local computer, _not_ to the content of the file.
+ Uploading files is a special case: to upload, the parameter `mime` must
+ contain a dict, and the parameter `file` must be set equal to a valid
+ filename on the local computer, *not* to the content of the file.
Returns a dict containing the JSON data returned by the wiki. Normally,
one of the dict keys will be equal to the value of the 'action'
@@ -104,15 +104,15 @@
>>> # add a new parameter
>>> r['siprop'] = "namespaces"
>>> # note that "uiprop" param gets added automatically
- >>> str(r.action)
+ >>> r.action
'query'
- >>> sorted(str(key) for key in r._params.keys())
+ >>> sorted(r._params)
['action', 'meta', 'siprop']
- >>> [str(key) for key in r._params['action']]
+ >>> r._params['action']
['query']
- >>> [str(key) for key in r._params['meta']]
+ >>> r._params['meta']
['userinfo', 'siteinfo']
- >>> [str(key) for key in r._params['siprop']]
+ >>> r._params['siprop']
['namespaces']
>>> data = r.submit()
>>> isinstance(data, dict)
@@ -121,9 +121,8 @@
True
>>> 'query' in data
True
- >>> sorted(str(key) for key in data['query'].keys())
+ >>> sorted(data['query'])
['namespaces', 'userinfo']
-
"""
# To make sure the default value of 'parameters' can be identified.
@@ -383,7 +382,7 @@
def keys(self):
"""Implement dict interface."""
- return list(self._params.keys())
+ return list(self._params)
def __iter__(self):
"""Implement dict interface."""
@@ -410,8 +409,7 @@
if hasattr(self, '__defaulted'):
return
- if self.mime is not None \
- and set(self._params.keys()) & set(self.mime.keys()):
+ if self.mime is not None and set(self._params) & set(self.mime):
raise ValueError('The mime and params shall not share the '
'same keys.')
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/807501
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: Ie3b0968b8fe0ae75b2cd0dc27fbe13b78708d20f
Gerrit-Change-Number: 807501
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot
Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com>
Gerrit-MessageType: merged