jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/357753 ) Change subject: Update category_redirect_templates for wikipedia and commons Family ...................................................................... Update category_redirect_templates for wikipedia and commons Family - remove template redirects because they are fetched by family._get_cr_templates(), see 5c382e9d - update several templates - template for pl-wiki has been deleted on that project - site.category_redirects() is the method to get this family table - remove @deprecated decorator from family category_redirects because this method is needed by category_redirect.py script. - use _get_cr_templates inside family.category_redirects() to prevent deprecation warning. - Change deprecation warning hint from Page.isCategoryRedirect() to the right methodsite.category_redirects(). - family.get_cr_templates is not a function. Just call family._get_cr_templates() - use site.category_redirects() in page.py library and category_redirect.py script Change-Id: Ic6772a77a5e3ed834622c01bc18b8f86bcb1fb9e --- M pywikibot/families/commons_family.py M pywikibot/families/wikipedia_family.py M pywikibot/family.py M pywikibot/page.py M scripts/category_redirect.py 5 files changed, 33 insertions(+), 87 deletions(-) Approvals: Merlijn van Deen: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/commons_family.py b/pywikibot/families/commons_family.py index f367001..7cd505d 100644 --- a/pywikibot/families/commons_family.py +++ b/pywikibot/families/commons_family.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Family module for Wikimedia Commons.""" # -# (C) Pywikibot team, 2005-2015 +# (C) Pywikibot team, 2005-2017 # # Distributed under the terms of the MIT license. # @@ -25,20 +25,11 @@ self.interwiki_forward = 'wikipedia' + # Templates that indicate a category redirect + # Redirects to these templates are automatically included self.category_redirect_templates = { 'commons': ( u'Category redirect', - u'Categoryredirect', - u'Catredirect', - u'Cat redirect', - u'Catredir', - u'Cat-red', - u'See cat', - u'Seecat', - u'See category', - u'Redirect category', - u'Redirect cat', - u'Redir cat', u'Synonym taxon category redirect', u'Invalid taxon category redirect', u'Monotypic taxon category redirect', diff --git a/pywikibot/families/wikipedia_family.py b/pywikibot/families/wikipedia_family.py index ea78af8..fbf2c74 100644 --- a/pywikibot/families/wikipedia_family.py +++ b/pywikibot/families/wikipedia_family.py @@ -72,84 +72,46 @@ super(Family, self).__init__() + # Templates that indicate a category redirect + # Redirects to these templates are automatically included self.category_redirect_templates = { '_default': (), - 'ar': (u'تحويل تصنيف', - u'تحويلة تصنيف', - u'Category redirect',), + 'ar': ('تحويل تصنيف',), 'arz': (u'تحويل تصنيف',), 'cs': (u'Zastaralá kategorie',), 'da': (u'Kategoriomdirigering',), 'en': (u'Category redirect',), 'es': (u'Categoría redirigida',), - 'eu': (u'Kategoria redirect',), - 'fa': (u'رده بهتر', - u'انتقال رده',), - 'fr': (u'Redirection de catégorie',), + 'eu': ('Kategoria birzuzendu',), + 'fa': ('رده بهتر',), + 'fr': ('Catégorie redirigée',), 'gv': (u'Aastiurey ronney',), - 'hi': (u'श्रेणीअनुप्रेषित', - u'Categoryredirect',), - 'hu': (u'Kat-redir', - u'Katredir', - u'Kat-redirekt',), - 'id': (u'Alih kategori', - u'Alihkategori',), + 'hi': ('श्रेणी अनुप्रेषित',), + 'hu': ('Kat-redir',), + 'id': ('Alih kategori',), 'ja': (u'Category redirect',), 'ko': (u'분류 넘겨주기',), 'mk': (u'Премести категорија',), 'ml': (u'Category redirect',), - 'ms': (u'Pengalihan kategori', - u'Categoryredirect', - u'Category redirect',), - 'mt': (u'Redirect kategorija',), - 'no': (u'Category redirect', - u'Kategoriomdirigering', - u'Kategori-omdirigering',), - 'pl': (u'Przekierowanie kategorii', - u'Category redirect',), - 'pt': (u'Redirecionamento de categoria', - u'Redircat', - u'Redirect-categoria',), + 'ms': ('Pengalihan kategori',), + 'mt': ('Rindirizzament kategorija',), + 'no': ('Kategoriomdirigering',), + 'pt': ('Redirecionamento de categoria',), 'ro': (u'Redirect categorie',), - 'ru': (u'Переименованная категория', - u'Categoryredirect', - u'CategoryRedirect', - u'Category redirect', - u'Catredirect',), + 'ru': ('Переименованная категория',), 'sco': ('Category redirect',), - 'simple': (u'Category redirect', - u'Categoryredirect', - u'Catredirect',), - 'sh': (u'Prekat', - u'Preusmeri kategoriju', - u'Preusmjeri kategoriju', - u'Prekategorizuj', - u'Catred', - u'Catredirect', - u'Category redirect'), - 'sl': (u'Category redirect',), - 'sq': (u'Kategori e zhvendosur', - u'Category redirect',), - 'sv': (u'Kategoriomdirigering', - u'Omdirigering kategori',), + 'sh': ('Prekat',), + 'simple': ('Category redirect',), + 'sl': ('Preusmeritev kategorije',), + 'sq': ('Kategori e zhvendosur',), + 'sv': ('Kategoriomdirigering',), 'tl': (u'Category redirect',), - 'tr': (u'Kategori yönlendirme', - u'Kat redir',), + 'tr': ('Kategori yönlendirme',), 'uk': (u'Categoryredirect',), - 'vi': (u'Đổi hướng thể loại', - u'Thể loại đổi hướng', - u'Chuyển hướng thể loại', - u'Categoryredirect', - u'Category redirect', - u'Catredirect',), + 'vi': ('Đổi hướng thể loại',), 'yi': (u'קאטעגאריע אריבערפירן',), - 'zh': (u'分类重定向', - u'Cr', - u'CR', - u'Cat-redirect',), - 'zh-yue': (u'Category redirect', - u'分類彈去', - u'分類跳轉',), + 'zh': ('分类重定向',), + 'zh-yue': ('分類彈去',), } # families that redirect their interlanguage links here. diff --git a/pywikibot/family.py b/pywikibot/family.py index c24e0f5..347165a 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -998,11 +998,11 @@ "ERROR: linktrail in language %(language_code)s unknown" % {'language_code': code}) - def _category_redirects(self, code, fallback='_default'): + def category_redirects(self, code, fallback='_default'): """Return list of category redirect templates.""" if not hasattr(self, "_catredirtemplates") or \ code not in self._catredirtemplates: - self.get_cr_templates(code, fallback) + self._get_cr_templates(code, fallback) if code in self._catredirtemplates: return self._catredirtemplates[code] else: @@ -1032,15 +1032,10 @@ cr_list.append(newtitle) self._catredirtemplates[code] = cr_list - @deprecated('Page.isCategoryRedirect') - def category_redirects(self, code, fallback="_default"): - """DEPRECATED: Return list of category redirect templates.""" - return self._category_redirects(code, fallback) - - @deprecated('Page.isCategoryRedirect') + @deprecated('site.category_redirects()') def get_cr_templates(self, code, fallback): """DEPRECATED: Build list of category redirect templates.""" - return self._get_cr_templates(code, fallback) + self._get_cr_templates(code, fallback) def disambig(self, code, fallback='_default'): """Return list of disambiguation templates.""" diff --git a/pywikibot/page.py b/pywikibot/page.py index 0c8fb44..941be19 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -846,7 +846,7 @@ if not self.is_categorypage(): return False if not hasattr(self, "_catredirect"): - catredirs = self.site._category_redirects() + catredirs = self.site.category_redirects() for (template, args) in self.templatesWithParams(): if template.title(withNamespace=False) in catredirs: # Get target (first template argument) diff --git a/scripts/category_redirect.py b/scripts/category_redirect.py index 1bfb843..132c2e4 100755 --- a/scripts/category_redirect.py +++ b/scripts/category_redirect.py @@ -264,10 +264,8 @@ def run(self): """Run the bot.""" # validate L10N - try: - self.template_list = self.site.family.category_redirect_templates[ - self.site.code] - except KeyError: + self.template_list = self.site.category_redirects() + if not self.template_list: pywikibot.warning(u"No redirect templates defined for %s" % self.site) return -- To view, visit https://gerrit.wikimedia.org/r/357753 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic6772a77a5e3ed834622c01bc18b8f86bcb1fb9e Gerrit-PatchSet: 6 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: John Vandenberg &lt;jayvdb(a)gmail.com&gt; Gerrit-Reviewer: Ladsgroup &lt;Ladsgroup(a)gmail.com&gt; Gerrit-Reviewer: Magul &lt;tomasz.magulski(a)gmail.com&gt; Gerrit-Reviewer: Merlijn van Deen &lt;valhallasw(a)arctus.nl&gt; Gerrit-Reviewer: Mpaa &lt;mpaa.wiki(a)gmail.com&gt; Gerrit-Reviewer: XXN &lt;dan15i(a)yahoo.com&gt; Gerrit-Reviewer: Xqt &lt;info(a)gno.de&gt; Gerrit-Reviewer: jenkins-bot <>