Pywikibot-commits October 2020

pywikibot-commits@lists.wikimedia.org

1 participants
186 discussions

[Gerrit] ...core[master]: "doc: updated basestring to str"
by jenkins-bot (Code Review) 15 Oct '20

15 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634201 ) Change subject: "doc: updated basestring to str" ...................................................................... "doc: updated basestring to str" Bug: T265128 Change-Id: I69410bad85e243dcf01c3bd12422f5a54fe92355 --- M tests/pagegenerators_tests.py M tests/site_detect_tests.py M tests/ui_tests.py M tests/uploadscript_tests.py M tests/wikibase_edit_tests.py 5 files changed, 8 insertions(+), 17 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/pagegenerators_tests.py b/tests/pagegenerators_tests.py index 4315832..6c5df6f 100755 --- a/tests/pagegenerators_tests.py +++ b/tests/pagegenerators_tests.py @@ -11,6 +11,7 @@ import sys from contextlib import suppress +from typing import Optional import pywikibot from pywikibot import pagegenerators, date @@ -727,20 +728,17 @@ """Test item claim filter page generator generator.""" - def _simple_claim_test(self, prop, claim, qualifiers, valid, negate=False): + def _simple_claim_test(self, prop: str, claim, qualifiers: Optional[dict], + valid: bool, negate: bool = False): """ Test given claim on sample (India) page. @param prop: the property to check - @type prop: str @param claim: the claim the property should contain @param qualifiers: qualifiers to check or None - @type qualifiers: dict or None @param valid: true if the page should be yielded by the generator, false otherwise - @type valid: bool @param negate: true to swap the filters' behavior - @type negate: bool """ item = pywikibot.ItemPage(self.get_repo(), 'Q668') gen = pagegenerators.ItemClaimFilterPageGenerator([item], prop, claim, diff --git a/tests/site_detect_tests.py b/tests/site_detect_tests.py index 8120d7b..0868237 100644 --- a/tests/site_detect_tests.py +++ b/tests/site_detect_tests.py @@ -26,12 +26,11 @@ net = True - def assertSite(self, url): + def assertSite(self, url: str): """ Assert a MediaWiki site can be loaded from the url. @param url: Url of tested site - @type url: str @raises AssertionError: Site under url is not MediaWiki powered """ try: @@ -39,12 +38,11 @@ except (ServerError, Timeout) as e: self.skipTest(e) - def assertNoSite(self, url): + def assertNoSite(self, url: str): """ Assert a url is not a MediaWiki site. @param url: Url of tested site - @type url: str @raises AssertionError: Site under url is MediaWiki powered """ with self.assertRaises((AttributeError, ConnectionError, RuntimeError, diff --git a/tests/ui_tests.py b/tests/ui_tests.py index 3da675f..52cb8e4 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -69,15 +69,13 @@ """Handler for a StringIO or BytesIO instance able to patch itself.""" - def __init__(self, name, patched_streams): + def __init__(self, name: str, patched_streams: dict): """ Create a new stream with a StringIO or BytesIO instance. @param name: The part after 'std' (e.g. 'err'). - @type name: str @param patched_streams: A mapping which maps the original stream to the patched stream. - @type patched_streams: dict """ self._stream = io.StringIO() self._name = 'std{0}'.format(name) diff --git a/tests/uploadscript_tests.py b/tests/uploadscript_tests.py index a6ac241..9e838ca 100644 --- a/tests/uploadscript_tests.py +++ b/tests/uploadscript_tests.py @@ -18,13 +18,11 @@ net = False - def match(self, value=''): + def match(self, value: str = '') -> int: """Create a match object and call get_chunk_site. @param value: a chunk size value - @type value: str @return: chunk size in bytes - @rtype: int """ option = '-chunked' if value: diff --git a/tests/wikibase_edit_tests.py b/tests/wikibase_edit_tests.py index 0766ef8..e8ece10 100644 --- a/tests/wikibase_edit_tests.py +++ b/tests/wikibase_edit_tests.py @@ -207,14 +207,13 @@ user = True write = True - def _clean_item(self, repo, prop): + def _clean_item(self, repo, prop: str): """ Return an item without any existing claims of the given property. @param repo: repository to fetch item from @type: pywikibot.site.DataSite @param prop: P-value of the property to scrub - @type prop: str @return: scrubbed item @rtype: pywikibot.ItemPage """ -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634201 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: I69410bad85e243dcf01c3bd12422f5a54fe92355 Gerrit-Change-Number: 634201 Gerrit-PatchSet: 5 Gerrit-Owner: Udoka <UdokakuUgochukwu(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] issue deprecation warning for Page.protect()
by jenkins-bot (Code Review) 15 Oct '20

15 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634190 ) Change subject: [IMPR] issue deprecation warning for Page.protect() ...................................................................... [IMPR] issue deprecation warning for Page.protect() Issue a clear deprecation warning for deprecated args of Page.protect(): - edit, move, create, upload, unprotect and prompt Bug: T227610 Change-Id: Ic232eae0113c261d7caa18effe3b946865c16f34 --- M pywikibot/page/__init__.py 1 file changed, 14 insertions(+), 7 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/page/__init__.py b/pywikibot/page/__init__.py index d9be9f3..55c9a23 100644 --- a/pywikibot/page/__init__.py +++ b/pywikibot/page/__init__.py @@ -2006,9 +2006,12 @@ value = '' if value is not None: # empty string is allowed protections[arg_name] = value - warn('"protections" argument of protect() replaces "{0}"' - .format(arg_name), - FutureWarning) + issue_deprecation_warning( + '"{}" argument of protect()'.format(arg_name), + '"protections" dict', + warning_class=FutureWarning, + since='20140815') + else: if value: warn('"protections" argument of protect() replaces "{0}";' @@ -2029,16 +2032,20 @@ % (self.title(as_link=True))) reason = pywikibot.input('Please enter a reason for the action:') if unprotect: - warn('"unprotect" argument of protect() is deprecated', - FutureWarning, 2) + issue_deprecation_warning( + '"unprotect" argument of protect()', + warning_class=FutureWarning, + since='20140815') protections = {p_type: '' for p_type in self.applicable_protections()} answer = 'y' if called_using_deprecated_arg and prompt is None: prompt = True if prompt: - warn('"prompt" argument of protect() is deprecated', - FutureWarning, 2) + issue_deprecation_warning( + '"prompt" argument of protect()', + warning_class=FutureWarning, + since='20140815') if prompt and not hasattr(self.site, '_noProtectPrompt'): answer = pywikibot.input_choice( 'Do you want to change the protection level of %s?' -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634190 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: Ic232eae0113c261d7caa18effe3b946865c16f34 Gerrit-Change-Number: 634190 Gerrit-PatchSet: 2 Gerrit-Owner: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Update templates for ar, arz
by jenkins-bot (Code Review) 15 Oct '20

15 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634099 ) Change subject: Update templates for ar, arz ...................................................................... Update templates for ar, arz Change-Id: I1aade8aa6d703a5dddaa5ffa465741f144ed70c4 --- M scripts/followlive.py 1 file changed, 43 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/followlive.py b/scripts/followlive.py index 27d4e99..bdc1c87 100644 --- a/scripts/followlive.py +++ b/scripts/followlive.py @@ -42,7 +42,7 @@ 'msg': 'وسم مساعد بالبوت: هذا المقال ينبغي حذفه', 'pos': 'top'}, - '{{تنظيف}}': { + '{{تهذيب}}': { 'msg': 'وسم مساعد بالبوت: هذا المقال يحتاج للتنظيف', 'pos': 'top'}, @@ -50,11 +50,53 @@ 'msg': 'وسم مساعد بالبوت: هذا المقال بذرة', 'pos': 'bottom'}, + '{{غير مصنفة}}': { + 'msg': ('وسم مساعد بالبوت: هذا المقال يحتاج ' + '[[ويكيبيديا:تصنيف|للتصنيف]]'), + 'pos': 'bottom'}, + + '{{ملحوظية}}': { + 'msg': ('وسم مساعد بالبوت: ' + '[[ويكيبيديا:ملحوظية|ملحوظية]] ' + 'هذا المقال غير واضحة.'), + 'pos': 'top'}, + + '{{مصادر أكثر}}': { + 'msg': ('وسم مساعد بالبوت: هذا المقال ينبغي مراجعته ' + 'من حيث الدقة.'), + 'pos': 'top'}, + + '{{تدقيق لغوي}}': { + 'msg': ('وسم مساعد بالبوت: أسلوب كتابة هذا المقال ' + 'يحتاج إلى [[ويكيبيديا:دليل الأسلوب|التدقيق اللغوي]] ' + 'والتحسين.'), + 'pos': 'top'}, + + '{{لا مصدر}}': { + 'msg': ('وسم مساعد بالبوت: هذا المقال يحتاج ' + '[[ويكيبيديا:الاستشهاد بمصادر|لمراجع]] حتى يمكن ' + 'التحقق منه.'), + 'pos': 'top'}, + '{{ويكي}}': { 'msg': 'وسم مساعد بالبوت: هذا المقال يحتاج إلى التنسيق ' 'بضيغة الويكي حسب [[ويكيبيديا:دليل الأسلوب|دليل الأسلوب]]', 'pos': 'top'}, }, + 'arz': { + '{{مسح}}': { + 'msg': 'وسم متساعد بالبوت: المقال ده محتاج يتمسح', + 'pos': 'top'}, + + '{{تقاوى}}': { + 'msg': 'وسم متساعد بالبوت: المقال ده تقاوى', + 'pos': 'bottom'}, + + '{{مش متصنفه}}': { + 'msg': ('وسم متساعد بالبوت: المقال ده محتاج ' + '[[ويكيبيديا:تصنيف|يتصنف]]'), + 'pos': 'bottom'}, + }, 'en': { '{{db-reason}}': { 'msg': 'Robot-assisted tagging: this article should be deleted', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634099 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: I1aade8aa6d703a5dddaa5ffa465741f144ed70c4 Gerrit-Change-Number: 634099 Gerrit-PatchSet: 4 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Updates for ar, arz, ary
by jenkins-bot (Code Review) 15 Oct '20

15 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634094 ) Change subject: Updates for ar, arz, ary ...................................................................... Updates for ar, arz, ary * placeBeforeSections * referencesTemplates * referencesSubstitute Change-Id: I87654f942874e29ec139613af14cfae79bf85d09 --- M scripts/noreferences.py 1 file changed, 23 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/noreferences.py b/scripts/noreferences.py index 253fdbc..25c734e 100755 --- a/scripts/noreferences.py +++ b/scripts/noreferences.py @@ -61,6 +61,11 @@ 'انظر أيضا', 'ملاحظات' ], + 'arz': [ # no explicit policy on where to put the references + 'لينكات برانيه', + 'لينكات', + 'شوف كمان' + ], 'ca': [ 'Bibliografia', 'Bibliografia complementària', @@ -243,6 +248,16 @@ 'المراجع والمصادر', 'المصادر والمراجع', ], + 'ary': [ + 'لمصادر', + 'مصادر', + ], + 'arz': [ + 'مراجع', + 'المراجع', + 'مصادر', + 'المصادر', + ], 'ca': [ 'Referències', ], @@ -396,8 +411,12 @@ # on your wiki, you don't have to enter anything here. referencesTemplates = { 'wikipedia': { - 'ar': ['Reflist', 'مراجع', 'ثبت المراجع', 'ثبت_المراجع', - 'بداية المراجع', 'نهاية المراجع', 'المراجع'], + 'ar': ['مراجع', 'المراجع', 'ثبت المراجع', + 'ثبت المصادر', 'قائمة مصادر', 'Reflist'], + 'ary': ['مراجع', 'المراجع', 'المصادر', + 'Reflist', 'Refs'], + 'arz': ['مصادر', 'مراجع', 'المراجع', 'ثبت المراجع', + 'Reflist', 'Refs'], 'be': ['Зноскі', 'Примечания', 'Reflist', 'Спіс заўваг', 'Заўвагі'], 'be-tarask': ['Зноскі'], @@ -450,6 +469,8 @@ referencesSubstitute = { 'wikipedia': { 'ar': '{{مراجع}}', + 'ary': '{{مراجع}}', + 'arz': '{{مصادر}}', 'be': '{{зноскі}}', 'da': '{{reflist}}', 'dsb': '{{referency}}', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634094 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: I87654f942874e29ec139613af14cfae79bf85d09 Gerrit-Change-Number: 634094 Gerrit-PatchSet: 8 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Update _templates for arz
by jenkins-bot (Code Review) 15 Oct '20

15 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634098 ) Change subject: Update _templates for arz ...................................................................... Update _templates for arz Change-Id: Ida8143137e200cd499c11f204e81ce5b8cca384c --- M scripts/lonelypages.py 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/lonelypages.py b/scripts/lonelypages.py index e7f7d2e..3b9655f 100755 --- a/scripts/lonelypages.py +++ b/scripts/lonelypages.py @@ -79,6 +79,7 @@ 'af': ('Weesbladsy', 'datum={{subst:CURRENTMONTHNAME}} ' '{{subst:CURRENTYEAR}}', ['wi']), 'ar': ('يتيمة', 'تاريخ={{نسخ:اسم_شهر}} {{نسخ:عام}}'), + 'arz': ('يتيمه', 'تاريخ={{subst:CURRENTMONTHNAME}} {{subst:CURRENTYEAR}}'), 'ca': ('Orfe', 'date={{subst:CURRENTMONTHNAME}} {{subst:CURRENTYEAR}}'), 'en': ('Orphan', 'date={{subst:CURRENTMONTHNAME}} {{subst:CURRENTYEAR}}', ['wi']), -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634098 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: Ida8143137e200cd499c11f204e81ce5b8cca384c Gerrit-Change-Number: 634098 Gerrit-PatchSet: 2 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Updates for ar, arz
by jenkins-bot (Code Review) 15 Oct '20

15 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634093 ) Change subject: Updates for ar, arz ...................................................................... Updates for ar, arz * dn_template * primary_topic_format * ignore_title * fix another typo (wikisource -> Wikisource) Change-Id: Iafa90cd3bcc131e12da09e41da0aba8dbd04699e --- M scripts/README.rst M scripts/solve_disambiguation.py M scripts/wikisourcetext.py 3 files changed, 5 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/README.rst b/scripts/README.rst index 41eba82..f2a1c30 100644 --- a/scripts/README.rst +++ b/scripts/README.rst @@ -254,7 +254,7 @@ +------------------------+---------------------------------------------------------+ | welcome.py | Script to welcome new users. | +------------------------+---------------------------------------------------------+ - | wikisourcetext.py | This bot applies to wikisource sites to upload text. | + | wikisourcetext.py | This bot applies to Wikisource sites to upload text. | +------------------------+---------------------------------------------------------+ diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index 57521b8..a078064 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -100,6 +100,8 @@ # Disambiguation Needed template dn_template = { + 'ar': '{{بحاجة لتوضيح}}', + 'arz': '{{Disambiguation needed}}', 'en': '{{dn}}', 'fr': '{{Lien vers un homonyme}}', } @@ -108,6 +110,7 @@ # (Begriffsklärungen nach Modell 2) primary_topic_format = { 'ar': '%s_(توضيح)', + 'arz': '%s_(توضيح)', 'ca': '%s_(desambiguació)', 'cs': '%s_(rozcestník)', 'de': '%s_(Begriffsklärung)', @@ -140,9 +143,6 @@ ignore_title = { 'wikipedia': { - 'ar': [ - 'تصنيف:صفحات توضيح', - ], 'ca': [ 'Viquipèdia:Enllaços incorrectes a pàgines de desambiguació', 'Viquipèdia:Registre de pàgines de desambiguació òrfenes', diff --git a/scripts/wikisourcetext.py b/scripts/wikisourcetext.py index ba3d670..13b3a2d 100644 --- a/scripts/wikisourcetext.py +++ b/scripts/wikisourcetext.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- """ -This bot applies to wikisource sites to upload text. +This bot applies to Wikisource sites to upload text. Text is uploaded to pages in Page ns, for a specified Index. Text to be stored, if the page is not-existing, is preloaded from the file used -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634093 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: Iafa90cd3bcc131e12da09e41da0aba8dbd04699e Gerrit-Change-Number: 634093 Gerrit-PatchSet: 3 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: [IMPR] Improvements for imagecopy_self.py
by jenkins-bot (Code Review) 15 Oct '20

15 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/585742 ) Change subject: [IMPR] Improvements for imagecopy_self.py ...................................................................... [IMPR] Improvements for imagecopy_self.py - use super call instead of explicit parent method call - use plain return statements if no result is applicable - use else statement of for loop to check match - use key in dict instead of bool(dict.get(key)) statement - simplify other codes - use setattr/getattr in TkdialogICS class to shorten attribute setting and dict build Change-Id: Ie065b98e3da15f7e643900ed644c2f8ab3d8797b --- M scripts/imagecopy_self.py 1 file changed, 69 insertions(+), 94 deletions(-) Approvals: Mpaa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/imagecopy_self.py b/scripts/imagecopy_self.py index 6fa8706..a442a61 100644 --- a/scripts/imagecopy_self.py +++ b/scripts/imagecopy_self.py @@ -298,9 +298,7 @@ def supportedSite(): """Check if this site is supported.""" site = pywikibot.Site() - lang = site.code - - lists = [ + l10n_dicts = [ nowCommonsTemplate, moveToCommonsTemplate, skipTemplates, @@ -309,10 +307,7 @@ informationTemplate, informationFields, ] - for item in lists: - if not item.get(lang): - return False - return True + return all(site.code in elem for elem in l10n_dicts) class imageFetcher(threading.Thread): @@ -324,7 +319,7 @@ self.pagegenerator = pagegenerator self.prefetchQueue = prefetchQueue imagerecat.initLists() - threading.Thread.__init__(self) + super().__init__() def run(self): """Run imageFetcher.""" @@ -336,29 +331,30 @@ def processImage(self, page): """Work on a single image.""" - if page.exists() and (page.namespace() == 6) and \ - (not page.isRedirectPage()): - imagepage = pywikibot.FilePage(page.site(), page.title()) + if not page.exists() or page.namespace() != 6 or page.isRedirectPage(): + return - # First do autoskip. - if self.doiskip(imagepage): - pywikibot.output( - 'Skipping {} : Got a template on the skip list.' - .format(page.title())) - return False + imagepage = pywikibot.FilePage(page.site(), page.title()) - text = imagepage.get() - foundMatch = False - for (regex, replacement) in licenseTemplates[page.site.lang]: - match = re.search(regex, text, flags=re.IGNORECASE) - if match: - foundMatch = True - if not foundMatch: - pywikibot.output( - 'Skipping {} : No suitable license template was found.' - .format(page.title())) - return False - self.prefetchQueue.put(self.getNewFields(imagepage)) + # First do autoskip. + if self.doiskip(imagepage): + pywikibot.output( + 'Skipping {} : Got a template on the skip list.' + .format(page.title())) + return + + text = imagepage.get() + for regex, replacement in licenseTemplates[page.site.lang]: + match = re.search(regex, text, flags=re.IGNORECASE) + if match: + break + else: + pywikibot.output( + 'Skipping {} : No suitable license template was found.' + .format(page.title())) + return + + self.prefetchQueue.put(self.getNewFields(imagepage)) def doiskip(self, imagepage): """Skip this image or not. @@ -377,8 +373,8 @@ def getNewFields(self, imagepage): """Build a new description based on the imagepage.""" - if '{{Information' in imagepage.get() or \ - '{{information' in imagepage.get(): + if '{{Information' in imagepage.get() \ + or '{{information' in imagepage.get(): (description, date, source, author, permission, other_versions) = self.getNewFieldsFromInformation(imagepage) else: @@ -415,10 +411,10 @@ description = '' permission = '' other_versions = '' - contents = {} - - for key, value in informationFields[imagepage.site.lang].items(): - contents[value] = '' + contents = { + value: '' + for value in informationFields[imagepage.site.lang].values() + } information = informationTemplate[imagepage.site.lang] fields = informationFields[imagepage.site.lang] @@ -427,8 +423,8 @@ if template.title() == information: for param in params: # Split at = - field, sep, value = param.partition('=') - # To lowercase, remove underscores and strip of spaces + field, _, value = param.partition('=') + # To lowercase, remove underscores and strip spaces field = field.lower().replace('_', ' ').strip() key = fields.get(field) # See if first part is in fields list @@ -444,7 +440,7 @@ if contents['description']: description = self.convertLinks(contents['description'], imagepage.site()) - if contents.get('remarks') and contents['remarks']: + if 'remarks' in contents: if description == '': description = self.convertLinks(contents['remarks'], imagepage.site()) @@ -458,14 +454,11 @@ imagepage.site())) # Date - if contents['date']: - date = contents['date'] - else: - date = self.getUploadDate(imagepage) + date = contents['date'] or self.getUploadDate(imagepage) # Author - if not (contents['author'] == '' - or contents['author'] == self.getAuthor(imagepage)): + if contents['author'] \ + and contents['author'] != self.getAuthor(imagepage): author = self.convertLinks(contents['author'], imagepage.site()) else: author = self.getAuthorText(imagepage) @@ -495,7 +488,7 @@ for toRemove in sourceGarbage[imagepage.site.lang]: text = re.sub(toRemove, '', text, flags=re.IGNORECASE) - for (regex, repl) in licenseTemplates[imagepage.site.lang]: + for regex, _ in licenseTemplates[imagepage.site.lang]: text = re.sub(regex, '', text, flags=re.IGNORECASE) text = removeCategoryLinks(text, imagepage.site()) @@ -525,7 +518,7 @@ site = imagepage.site() lang = site.code family = site.family.name - if source == '': + if not source: source = '{{Own}}' return (source.strip() @@ -539,10 +532,9 @@ family = site.family.name firstuploader = self.getAuthor(imagepage) - return ('[[:%(lang)s:User:%(firstuploader)s|%(firstuploader)s]] at ' - '[http://%(lang)s.%(family)s.org %(lang)s.%(family)s]' - % {'lang': lang, 'family': family, - 'firstuploader': firstuploader}) + return '[[:{lang}:User:{firstuploader}|{firstuploader}]] at ' \ + '[http://{lang}.{family}.org {lang}.{family}]'.format( + lang=lang, family=family, firstuploader=firstuploader) def getAuthor(self, imagepage): """Get the first uploader.""" @@ -583,14 +575,13 @@ """Get categories for the image. Don't forget to filter. - """ result = '' (commonshelperCats, usage, galleries) = imagerecat.getCommonshelperCats(imagepage) newcats = imagerecat.applyAllFilters(commonshelperCats) for newcat in newcats: - result += '[[Category:' + newcat + ']] ' + result += '[[Category:{}]] '.format(newcat) return result @@ -603,16 +594,16 @@ self.prefetchQueue = prefetchQueue self.uploadQueue = uploadQueue self.autonomous = False - threading.Thread.__init__(self) + super().__init__() def run(self): """Run thread.""" while True: fields = self.prefetchQueue.get() - if fields: - self.processImage(fields) - else: + if not fields: break + self.processImage(fields) + self.uploadQueue.put(None) pywikibot.output('User worked on all images.') return True @@ -620,7 +611,6 @@ def setAutonomous(self): """Don't do any user interaction.""" self.autonomous = True - return def processImage(self, fields): """Work on a single image.""" @@ -631,7 +621,7 @@ 'commons'), 'File:' + fields.get('filename')) if CommonsPage.exists(): - return False + return else: while True: # Do the TkdialogICS to accept/reject and change the name @@ -640,7 +630,7 @@ if fields.get('skip'): pywikibot.output('Skipping {} : User pressed skip.' .format(fields.get('imagepage').title())) - return False + return # Check if the image already exists CommonsPage = pywikibot.Page(pywikibot.Site('commons', @@ -648,11 +638,11 @@ 'File:' + fields.get('filename')) if not CommonsPage.exists(): break - else: - pywikibot.output('Image already exists, pick another name ' - 'or skip this image') - # We don't overwrite images, pick another name, go to the - # start of the loop + + # We don't overwrite images, pick another name, go to the + # start of the loop + pywikibot.output('Image already exists, pick another name ' + 'or skip this image') # Put the fields in the queue to be uploaded self.uploadQueue.put(fields) @@ -662,6 +652,10 @@ """The dialog window for image info.""" + fieldnames = ['author', 'categories', 'date', 'description', 'filename', + 'imagepage', 'licensetemplate', 'other_versions', + 'permission', 'source'] + def __init__(self, fields): """Initializer. @@ -669,7 +663,6 @@ imagepage, description, date, source, author, licensetemplate, categories """ - """Initializer.""" # Check if `Tkinter` wasn't imported if isinstance(Tkinter, ImportError): raise Tkinter @@ -682,18 +675,9 @@ # Get all the relevant fields super().__init__() - self.imagepage = fields.get('imagepage') - self.filename = fields.get('filename') + for name in self.fieldnames: + setattr(self, name, fields.get(name)) - self.description = fields.get('description') - self.date = fields.get('date') - self.source = fields.get('source') - self.author = fields.get('author') - self.permission = fields.get('permission') - self.other_versions = fields.get('other_versions') - - self.licensetemplate = fields.get('licensetemplate') - self.categories = fields.get('categories') self.skip = False # Start building the page @@ -827,17 +811,8 @@ """Activate dialog and return new name and if the image is skipped.""" self.root.mainloop() - return {'imagepage': self.imagepage, - 'filename': self.filename, - 'description': self.description, - 'date': self.date, - 'source': self.source, - 'author': self.author, - 'permission': self.permission, - 'other_versions': self.other_versions, - 'licensetemplate': self.licensetemplate, - 'categories': self.categories, - 'skip': self.skip} + return {name: getattr(self, name) + for name in self.fieldnames + ['skip']} def open_in_browser(self): """The user pressed the View in browser button.""" @@ -858,16 +833,14 @@ """Run uploader.""" while True: # Change later fields = self.uploadQueue.get() - if fields: - self.processImage(fields) - else: + if not fields: break + self.processImage(fields) return True def nochecktemplate(self): """Don't want to add {{BotMoveToCommons}}.""" self.checktemplate = False - return def processImage(self, fields): """Work on a single image.""" @@ -881,8 +854,10 @@ target_site=pywikibot.Site('commons', 'commons')) bot.run() - self.tagNowcommons(fields.get('imagepage'), fields.get('filename')) - self.replaceUsage(fields.get('imagepage'), fields.get('filename')) + imagepage = fields.get('imagepage') + filename = fields.get('filename') + self.tagNowcommons(imagepage, filename) + self.replaceUsage(imagepage, filename) def buildNewImageDescription(self, fields): """Build a new information template.""" @@ -912,7 +887,7 @@ cid += '\n' cid += self.getOriginalUploadLog(fields.get('imagepage')) cid += '__NOTOC__\n' - if fields.get('categories').strip() == '': + if not fields.get('categories').strip(): cid = cid + '{{Subst:Unc}}' else: cid = cid + '%(categories)s\n' % fields -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/585742 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: Ie065b98e3da15f7e643900ed644c2f8ab3d8797b Gerrit-Change-Number: 585742 Gerrit-PatchSet: 10 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Update ignoreTemplates for arz, ary
by jenkins-bot (Code Review) 14 Oct '20

14 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634005 ) Change subject: Update ignoreTemplates for arz, ary ...................................................................... Update ignoreTemplates for arz, ary Change-Id: I697d082d981d51901290534ba7ed2e472305d4a6 --- M scripts/interwiki.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/interwiki.py b/scripts/interwiki.py index e071403..ff4baad 100755 --- a/scripts/interwiki.py +++ b/scripts/interwiki.py @@ -385,6 +385,8 @@ ignoreTemplates = { '_default': ['delete'], 'ar': ['تحرر', 'تحويل لين'], + 'ary': ['كاتبدل دابا'], + 'arz': ['بتتطور'], 'cs': ['Pracuje_se'], 'de': ['inuse', 'in use', 'in bearbeitung', 'inbearbeitung', 'löschen', 'sla', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634005 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: I697d082d981d51901290534ba7ed2e472305d4a6 Gerrit-Change-Number: 634005 Gerrit-PatchSet: 2 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Updates for ar, arz and minor changes
by jenkins-bot (Code Review) 14 Oct '20

14 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634000 ) Change subject: Updates for ar, arz and minor changes ...................................................................... Updates for ar, arz and minor changes * Update MonthName, Cat_DeathsAD, makeMonthNamedList formats for arz * Update CurrEvents format for ar, arz * arz.wiktionary does not exist. So, let's use a Wiktionary version that exists * typo in Spanish (Articulo -> Artículo) * english -> English Change-Id: I2abaf7bac24028243f74e67ceab52c80a7249a8f --- M pywikibot/cosmetic_changes.py M pywikibot/date.py M pywikibot/textlib.py 3 files changed, 13 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/cosmetic_changes.py b/pywikibot/cosmetic_changes.py index 2bd8d34..b5406d6 100755 --- a/pywikibot/cosmetic_changes.py +++ b/pywikibot/cosmetic_changes.py @@ -377,7 +377,7 @@ def translateAndCapitalizeNamespaces(self, text): """Use localized namespace names.""" - # arz uses english stylish codes + # arz uses English stylish codes if self.site.sitename == 'wikipedia:arz': return text # wiki links aren't parsed here. @@ -438,7 +438,7 @@ def translateMagicWords(self, text): """Use localized magic words.""" # not wanted at ru - # arz uses english stylish codes + # arz uses English stylish codes # no need to run on English wikis if self.site.code in ['arz', 'en', 'ru']: return text diff --git a/pywikibot/date.py b/pywikibot/date.py index 8b8d908..848a08e 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -527,6 +527,9 @@ 'ar': lambda v: slh(v, ['يناير', 'فبراير', 'مارس', 'أبريل', 'مايو', 'يونيو', 'يوليو', 'أغسطس', 'سبتمبر', 'أكتوبر', 'نوفمبر', 'ديسمبر']), + 'arz': lambda v: slh(v, ['يناير', 'فبراير', 'مارس', 'ابريل', 'مايو', + 'يونيه', 'يوليه', 'اغسطس', 'سبتمبر', + 'اكتوبر', 'نوفمبر', 'ديسمبر']), 'ast': lambda v: slh(v, ['xineru', 'febreru', 'marzu', 'abril', 'mayu', 'xunu', 'xunetu', 'agostu', 'setiembre', 'ochobre', 'payares', @@ -1648,6 +1651,7 @@ 'an': lambda v: dh_yearAD(v, '%d (muertes)'), 'ay': lambda v: dh_yearAD(v, 'Jiwäwi %d'), 'ar': lambda v: dh_yearAD(v, 'وفيات %d'), + 'arz': lambda v: dh_yearAD(v, 'وفيات %d'), 'ba': lambda v: dh_yearAD(v, '%d йылда үлгәндәр'), 'bar': lambda v: dh_yearAD(v, 'Gestorben %d'), 'be': lambda v: dh_yearAD(v, 'Памерлі ў %d годзе'), @@ -1743,7 +1747,8 @@ 'CurrEvents': { 'an': lambda v: dh_singVal(v, 'Autualidá'), 'ang': lambda v: dh_singVal(v, 'Efenealde belimpas'), - 'ar': lambda v: dh_singVal(v, 'الأحداث الجارية'), + 'ar': lambda v: dh_singVal(v, 'أحداث جارية'), + 'arz': lambda v: dh_singVal(v, 'احداث دلوقتى'), 'be': lambda v: dh_singVal(v, 'Бягучыя падзеі'), 'bg': lambda v: dh_singVal(v, 'Текущи събития'), 'ca': lambda v: dh_singVal(v, 'Viquipèdia:Actualitat'), @@ -1870,6 +1875,9 @@ addFmt1('ar', False, ['%d يناير', '%d فبراير', '%d مارس', '%d أبريل', '%d مايو', '%d يونيو', '%d يوليو', '%d أغسطس', '%d سبتمبر', '%d أكتوبر', '%d نوفمبر', '%d ديسمبر']) +addFmt1('arz', False, ['%d يناير', '%d فبراير', '%d مارس', '%d ابريل', + '%d مايو', '%d يونيه', '%d يوليه', '%d اغسطس', + '%d سبتمبر', '%d اكتوبر', '%d نوفمبر', '%d ديسمبر']) addFmt1('ast', False, ['%d de xineru', '%d de febreru', '%d de marzu', "%d d'abril", '%d de mayu', '%d de xunu', '%d de xunetu', "%d d'agost", '%d de setiembre', diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 9af5ee5..7d6ea80 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -913,7 +913,7 @@ # 1 - inter-language links inside the own family. # They go to a corresponding page in another language in the same # family, such as from 'en.wikipedia' to 'pt.wikipedia', or from -# 'es.wiktionary' to 'arz.wiktionary'. +# 'es.wiktionary' to 'ar.wiktionary'. # Families with this kind have several language-specific sites. # They have their interwiki_forward attribute set to None # 2 - language links forwarding to another family. @@ -924,7 +924,7 @@ # inter-language links is kept in their interwiki_forward attribute. # These functions only deal with links of these two kinds only. They # do not find or change links of other kinds, nor any that are formatted -# as in-line interwiki links (e.g., "[[:es:Articulo]]". +# as in-line interwiki links (e.g., "[[:es:Artículo]]". @deprecate_arg('pageLink', None) def getLanguageLinks(text: str, insite=None, template_subpage=False) -> dict: -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/634000 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: I2abaf7bac24028243f74e67ceab52c80a7249a8f Gerrit-Change-Number: 634000 Gerrit-PatchSet: 4 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

[Gerrit] ...core[master]: Updates for ar, arz, ary
by jenkins-bot (Code Review) 14 Oct '20

14 Oct '20

jenkins-bot has submitted this change. ( https://gerrit.wikimedia.org/r/c/pywikibot/core/+/633988 ) Change subject: Updates for ar, arz, ary ...................................................................... Updates for ar, arz, ary * nowCommonsTemplate * moveToCommonsTemplate * skipTemplates * informationTemplate * informationFields * http -> https Change-Id: I9814f3c07f94e258518230211ef878110ce0e9fc --- M scripts/imagecopy.py M scripts/imagecopy_self.py M scripts/imagetransfer.py 3 files changed, 46 insertions(+), 1 deletion(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/imagecopy.py b/scripts/imagecopy.py index aae2751..ae631b4 100644 --- a/scripts/imagecopy.py +++ b/scripts/imagecopy.py @@ -98,6 +98,8 @@ 'am': '{{NowCommons|File:%s}}', 'ang': '{{NowCommons|File:%s}}', 'ar': '{{الآن كومنز|%s}}', + 'ary': '{{Now Commons|%s}}', + 'arz': '{{Now Commons|%s}}', 'ast': '{{EnCommons|File:%s}}', 'az': '{{NowCommons|%s}}', 'bar': '{{NowCommons|%s}}', diff --git a/scripts/imagecopy_self.py b/scripts/imagecopy_self.py index 6fa8706..977638a 100644 --- a/scripts/imagecopy_self.py +++ b/scripts/imagecopy_self.py @@ -3,7 +3,7 @@ Script to copy self published files from English Wikipedia to Commons. This bot is based on imagecopy.py and intended to be used to empty out -http://en.wikipedia.org/wiki/Category:Self-published_work +https://en.wikipedia.org/wiki/Category:Self-published_work This bot uses a graphical interface and may not work from commandline only environment. @@ -62,6 +62,9 @@ NL = '' nowCommonsTemplate = { + 'ar': '{{الآن كومنز|%s}}', + 'ary': '{{Now Commons|%s}}', + 'arz': '{{Now Commons|%s}}', 'de': '{{NowCommons|%s}}', 'en': ('{{NowCommons|1=File:%s|date=~~~~~|' 'reviewer={{subst:REVISIONUSER}}}}'), @@ -72,6 +75,9 @@ } moveToCommonsTemplate = { + 'ar': ['نقل إلى كومنز', 'Copy to Wikimedia Commons'], + 'ary': ['نقل إلى كومنز', 'Copy to Wikimedia Commons'], + 'arz': ['نقل ل كومنز', 'Copy to Wikimedia Commons'], 'de': ['NowCommons', 'NC', 'NCT', 'Nowcommons'], 'en': ['Commons ok', 'Copy to Wikimedia Commons', 'Move to commons', 'Movetocommons', 'To commons', @@ -82,6 +88,11 @@ } skipTemplates = { + 'ar': ['NowCommons', + 'الآن كومونز', + ], + 'ary': ['NowCommons', ], + 'arz': ['NowCommons', ], 'de': ['Löschprüfung', 'NoCommons', 'NowCommons', @@ -240,6 +251,9 @@ } informationTemplate = { + 'ar': 'معلومات', + 'ary': 'معلومات', + 'arz': 'معلومات', 'de': 'Information', 'en': 'Information', 'lb': 'Information', @@ -248,6 +262,33 @@ } informationFields = { + 'ar': { + 'location': 'remarks', + 'وصف': 'description', + 'مصدر': 'source', + 'تاريخ': 'date', + 'منتج': 'author', + 'إذن': 'permission', + 'نسخ أخرى': 'other versions', + }, + 'ary': { + 'location': 'remarks', + 'وصف': 'description', + 'مصدر': 'source', + 'تاريخ': 'date', + 'منتج': 'author', + 'إذن': 'permission', + 'نسخ أخرى': 'other versions', + }, + 'arz': { + 'location': 'remarks', + 'وصف': 'description', + 'مصدر': 'source', + 'تاريخ': 'date', + 'منتج': 'author', + 'إذن': 'permission', + 'نسخ أخرى': 'other versions', + }, 'de': { 'anmerkungen': 'remarks', # FIXME: More flexible 'beschreibung': 'description', diff --git a/scripts/imagetransfer.py b/scripts/imagetransfer.py index b315916..293ae8e 100755 --- a/scripts/imagetransfer.py +++ b/scripts/imagetransfer.py @@ -48,6 +48,8 @@ nowCommonsTemplate = { 'ar': '{{الآن كومنز|%s}}', + 'ary': '{{Now Commons|%s}}', + 'arz': '{{Now Commons|%s}}', 'de': '{{NowCommons|%s}}', 'fr': '{{Désormais sur Commons|%s}}', 'en': '{{subst:ncd|Image:%s}}', -- To view, visit https://gerrit.wikimedia.org/r/c/pywikibot/core/+/633988 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: I9814f3c07f94e258518230211ef878110ce0e9fc Gerrit-Change-Number: 633988 Gerrit-PatchSet: 9 Gerrit-Owner: Meno25 <meno25mail(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot Gerrit-MessageType: merged

1 0

← Newer
1
...
9
10
11
12
13
14
15
...
19
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits October 2020