jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1255703?usp=email )
Change subject: Localisation updates from https://translatewiki.net.
......................................................................
Localisation updates from https://translatewiki.net.
Change-Id: I42bf22e98870316c5a683e484de2152f434c3abb
---
M delete/nl.json
M redirect/vi.json
M weblinkchecker/vi.json
3 files changed, 7 insertions(+), 4 deletions(-)
Approvals:
L10n-bot: Looks good to me, approved
jenkins-bot: Verified
diff --git a/delete/nl.json b/delete/nl.json
index 3fc2de0..e1824c1 100644
--- a/delete/nl.json
+++ b/delete/nl.json
@@ -5,6 +5,7 @@
"Siebrand"
]
},
+ "delete-broken-redirect": "Robot: Verwijder de doorverwijzing naar de verwijderde pagina %(page)s",
"delete-from-category": "Robot: alle pagina's uit categorie %(page)s worden verwijderd",
"delete-from-file": "Robot: lijst met pagina's verwijderd",
"delete-images": "Robot: alle afbeeldingen op pagina %(page)s verwijderd",
diff --git a/redirect/vi.json b/redirect/vi.json
index 64a73bd..df06638 100644
--- a/redirect/vi.json
+++ b/redirect/vi.json
@@ -1,13 +1,14 @@
{
"@metadata": {
"authors": [
+ "Bapham123",
"Keo010122",
"Minh Nguyen"
]
},
- "redirect-fix-broken-moved": "Sửa đổi hướng hỏng đến %(to)s",
- "redirect-fix-double": "Giải quyết đổi hướng kép đến %(to)s",
- "redirect-fix-loop": "Sửa vòng lặp đổi hướng đến %(to)s",
+ "redirect-fix-broken-moved": "Sửa đổi hướng hỏng đến từ %(from)s %(to)s",
+ "redirect-fix-double": "Giải quyết đổi hướng kép từ %(from)s đến %(to)s",
+ "redirect-fix-loop": "Sửa vòng lặp đổi hướng từ %(from)s đến %(to)s",
"redirect-remove-broken": "Đổi hướng đến trang xóa hoặc không tồn tại",
"redirect-remove-loop": "Mục tiêu đổi hướng tạo thành vòng lặp"
}
diff --git a/weblinkchecker/vi.json b/weblinkchecker/vi.json
index cf6bfa8..49491f6 100644
--- a/weblinkchecker/vi.json
+++ b/weblinkchecker/vi.json
@@ -1,12 +1,13 @@
{
"@metadata": {
"authors": [
+ "Bapham123",
"Keo010122",
"Minh Nguyen"
]
},
"weblinkchecker-archive_msg": "Trang Web đã được Internet Archive lưu trữ. Xin vui lòng đặt liên kết đến bản lưu trữ: [%(URL)s].",
- "weblinkchecker-badurl": "Liên kết được cung cấp có thể không phải là URL hợp lệ",
+ "weblinkchecker-badurl": "Liên kết được cung cấp có thể không phải là URL hợp lệ: [%(URL)s]",
"weblinkchecker-caption": "Liên kết hỏng",
"weblinkchecker-report": "Bot tự động chạy vài lần mà không truy cập được liên kết bên ngoài sau. Vui lòng kiểm tra nó thực sự bị hỏng, và nếu vậy, xin sửa hoặc xóa liên kết.",
"weblinkchecker-summary": "Bot: Báo cáo liên kết bên ngoài không truy cập được"
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/i18n/+/1255703?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/i18n
Gerrit-Branch: master
Gerrit-Change-Id: I42bf22e98870316c5a683e484de2152f434c3abb
Gerrit-Change-Number: 1255703
Gerrit-PatchSet: 1
Gerrit-Owner: L10n-bot <l10n-bot(a)translatewiki.net>
Gerrit-Reviewer: L10n-bot <l10n-bot(a)translatewiki.net>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1251963?usp=email )
Change subject: [bugfix] Re-enable code entry point
......................................................................
[bugfix] Re-enable code entry point
With 7266b7c2 the code entry point was broken in Pywikibot 11.
Now handle missing wikitextparser and mwparserfromhell gracefully
in textlib and lazy raise ModuleNotFoundError when using
extract_templates_and_params.4
Also as a sanity check raise a RuntimeError if check_modules function
is called from site-package and remove the code which has broken the
entry point.
Bug: T420086
Change-Id: I0aa14e30022f0e08da335c2bd468a7ac53b48bc0
---
M pywikibot/scripts/wrapper.py
M pywikibot/textlib.py
2 files changed, 24 insertions(+), 12 deletions(-)
Approvals:
JJMC89: Looks good to me, approved
jenkins-bot: Verified
diff --git a/pywikibot/scripts/wrapper.py b/pywikibot/scripts/wrapper.py
index dff7baa..a7e607b 100755
--- a/pywikibot/scripts/wrapper.py
+++ b/pywikibot/scripts/wrapper.py
@@ -236,19 +236,24 @@
:param script: The script name to be checked for dependencies
:return: True if all dependencies are installed
- :raise RuntimeError: wrong Python version found in setup.py
+ :raise RuntimeError: wrong Python version found in setup.py or
+ function is called in site-package environment.
"""
+ if site_package:
+ raise RuntimeError(
+ "check_modules function shouldn't be called from site-package"
+ )
+
try:
from packaging.requirements import Requirement
except ModuleNotFoundError:
_print_requirements(['packaging'], None, 'missing')
sys.exit()
- from setup import script_deps
-
missing_requirements = []
version_conflicts = []
+ from setup import script_deps
if script:
dependencies = script_deps.get(Path(script).name, [])
else:
@@ -294,9 +299,6 @@
return not missing_requirements
-if not check_modules():
- sys.exit()
-
filename, script_args, global_args, environ = handle_args(*sys.argv)
# Search for user config file (user-config.py) before creating one.
@@ -558,6 +560,7 @@
"""
global site_package
site_package = True
+
if not execute():
print(__doc__)
diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py
index 5ccaacf..269f43e 100644
--- a/pywikibot/textlib.py
+++ b/pywikibot/textlib.py
@@ -28,8 +28,11 @@
try:
import wikitextparser
-except ImportError:
- import mwparserfromhell as wikitextparser
+except ModuleNotFoundError:
+ try:
+ import mwparserfromhell as wikitextparser
+ except ModuleNotFoundError as e:
+ wikitextparser = e
# cache for replaceExcept to avoid recompile or regexes each call
@@ -2046,15 +2049,18 @@
To replicate that behaviour, enable both `remove_disabled_parts`
and `strip` parameters.
+ .. version-changed:: 6.1
+ *wikitextparser* package is supported; either *wikitextparser* or
+ *mwparserfromhell* is strictly recommended.
+ .. version-changed:: 11.1
+ Raise ModuleNotFoundError if no wikitext parser is installed.
+
:param text: The wikitext from which templates are extracted
:param remove_disabled_parts: If enabled, remove disabled wikitext
such as comments and pre.
:param strip: If enabled, strip arguments and values of templates.
:return: List of template name and params
-
- .. version-changed:: 6.1
- *wikitextparser* package is supported; either *wikitextparser* or
- *mwparserfromhell* is strictly recommended.
+ :raises ModuleNotFoundError: No wikitext parser is installed.
"""
def explicit(param):
try:
@@ -2063,6 +2069,9 @@
attr = not param.positional
return attr
+ if isinstance(wikitextparser, Exception):
+ raise wikitextparser
+
if remove_disabled_parts:
text = removeDisabledParts(text)
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1251963?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I0aa14e30022f0e08da335c2bd468a7ac53b48bc0
Gerrit-Change-Number: 1251963
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: JJMC89 <JJMC89.Wikimedia(a)gmail.com>
Gerrit-Reviewer: jenkins-bot
jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1251525?usp=email )
Change subject: doc: Update documentation for Pywikibot 11.1
......................................................................
doc: Update documentation for Pywikibot 11.1
Bug: T418994
Change-Id: I17b358b4a6b705112a5c4e44d6e1288e16487738
---
M ROADMAP.rst
M pywikibot/page/_filepage.py
M pywikibot/throttle.py
M scripts/CHANGELOG.rst
4 files changed, 15 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Xqt: Looks good to me, approved
diff --git a/ROADMAP.rst b/ROADMAP.rst
index 2bf3d96..f43514b 100644
--- a/ROADMAP.rst
+++ b/ROADMAP.rst
@@ -1,6 +1,12 @@
Release 11.1
============
+* Add support for kaiwiki (:phab:`T414239`)
+* Add support for urwikisource (:phab:`T415976`)
+* Raise :exc:`NotImplementedError` instead of :exc:`AttributeError` if a
+ :class:`Site<pywikibot.site._basesite.BaseSite>` method cannot be delegated to the corresponding
+ :class:`Family<family.Family>` (:phab:`T417961`)
+* Use read throttle with :meth:`pywikibot.FilePage.download` per Wikitech robot policy for download (:phab:`T418672`)
* Add *namespaces* parameter to :func:`pagegenerators.SubCategoriesPageGenerator` (:phab:`T417961`)
* Fix nightly package version detection in :meth:`version.getversion_nightly`
* Remove warning in :attr:`data.api.QueryGenerator.set_namespace` (:phab:`T196619`, :phab:`T198452`)
diff --git a/pywikibot/page/_filepage.py b/pywikibot/page/_filepage.py
index c9738a5..bdbcc6f 100644
--- a/pywikibot/page/_filepage.py
+++ b/pywikibot/page/_filepage.py
@@ -365,6 +365,9 @@
.. version-changed:: 8.2
*filename* argument may be also a path-like object or an
iterable of path segments.
+ .. version-changed:: 11.1
+ Use a read throttle for download per Wikitech robot policy.
+ Set it to 25 times of :attr:`throttle.Throttle.delay`.
.. note:: filename suffix is adjusted if target url's suffix is
different which may be the case if a thumbnail is loaded.
.. warning:: If a file already exists, it will be overridden
diff --git a/pywikibot/throttle.py b/pywikibot/throttle.py
index 64adc90..4c16c61 100644
--- a/pywikibot/throttle.py
+++ b/pywikibot/throttle.py
@@ -90,7 +90,10 @@
self.last_write = 0.0
self.retry_after = 0 # set by http.request
- self.delay = 0
+
+ #: the minimum access delay, usually set by config.minthrottle
+ self.delay: int = 0
+
self.checktime = 0.0
self.modules: Counter[str] = Counter()
diff --git a/scripts/CHANGELOG.rst b/scripts/CHANGELOG.rst
index 2d2df82..13a02ba 100644
--- a/scripts/CHANGELOG.rst
+++ b/scripts/CHANGELOG.rst
@@ -4,6 +4,8 @@
11.1.0
------
+* i18n updates
+
weblinkchecker
^^^^^^^^^^^^^^
--
To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/1251525?usp=email
To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: pywikibot/core
Gerrit-Branch: master
Gerrit-Change-Id: I17b358b4a6b705112a5c4e44d6e1288e16487738
Gerrit-Change-Number: 1251525
Gerrit-PatchSet: 1
Gerrit-Owner: Xqt <info(a)gno.de>
Gerrit-Reviewer: Xqt <info(a)gno.de>
Gerrit-Reviewer: jenkins-bot