Pywikibot-commits February 2020

pywikibot-commits@lists.wikimedia.org

1 participants
82 discussions

[Gerrit] pywikibot/core[master]: [IMPR] Directly import UserAgent from fake-useragent
by jenkins-bot (Code Review) 29 Feb '20

29 Feb '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/575693 ) Change subject: [IMPR] Directly import UserAgent from fake-useragent ...................................................................... [IMPR] Directly import UserAgent from fake-useragent Also simplify the deprecated get_fake_user_agent function. Change-Id: Ic3f1d6ae9edc1a428af629943d18c6e3a7e05e19 --- M pywikibot/comms/http.py 1 file changed, 5 insertions(+), 6 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index b95eadd..e09f880 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -12,7 +12,7 @@ - Basic HTTP error handling """ # -# (C) Pywikibot team, 2007-2019 +# (C) Pywikibot team, 2007-2020 # # Distributed under the terms of the MIT license. # @@ -244,10 +244,9 @@ """ if isinstance(config.fake_user_agent, StringTypes): return config.fake_user_agent - elif config.fake_user_agent or config.fake_user_agent is None: - return fake_user_agent() - else: + if config.fake_user_agent is False: return user_agent() + return fake_user_agent() def fake_user_agent(): @@ -257,11 +256,11 @@ @rtype: str """ try: - import fake_useragent - return fake_useragent.fake.UserAgent().random + from fake_useragent import UserAgent except ImportError: raise ImportError( # Actually complain when fake_useragent is missing. 'fake_useragent must be installed to get fake UAs.') + return UserAgent().random @deprecate_arg('ssl', None) -- To view, visit https://gerrit.wikimedia.org/r/575693 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ic3f1d6ae9edc1a428af629943d18c6e3a7e05e19 Gerrit-Change-Number: 575693 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] update wowwiki family file
by jenkins-bot (Code Review) 29 Feb '20

29 Feb '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/572648 ) Change subject: [bugfix] update wowwiki family file ...................................................................... [bugfix] update wowwiki family file Change-Id: I43be11f0d9f0a3fab44658ee407e15b350a0d7f7 --- M pywikibot/families/wowwiki_family.py 1 file changed, 20 insertions(+), 14 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py index 08129c9..2727a38 100644 --- a/pywikibot/families/wowwiki_family.py +++ b/pywikibot/families/wowwiki_family.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Family module for WOW Wiki.""" # -# (C) Pywikibot team, 2009-2019 +# (C) Pywikibot team, 2009-2020 # # Distributed under the terms of the MIT license. # @@ -11,7 +11,7 @@ from pywikibot.tools import deprecated, classproperty -class Family(family.SubdomainFamily, family.FandomFamily): +class Family(family.FandomFamily): """Family class for WOW Wiki.""" @@ -21,10 +21,10 @@ codes = ( 'ar', 'cs', 'da', 'de', 'el', 'en', 'es', 'et', 'fa', 'fi', 'fr', 'he', 'hu', 'is', 'it', 'ja', 'ko', 'lt', 'lv', 'nl', 'nn', 'no', 'pl', 'pt', - 'pt-br', 'ru', 'sk', 'tr', 'uk', 'zh', 'zh-tw' + 'pt-br', 'ru', 'sk', 'sv', 'tr', 'uk', 'zh', 'zh-tw' ) - removed_wikis = ['hr', 'ro', 'sr', 'sv'] + removed_wikis = ['hr', 'ro', 'sr'] @classproperty @deprecated('codes attribute', since='20190422') @@ -32,12 +32,21 @@ """DEPRECATED. languages_by_size property for compatibility purpose.""" return list(cls.codes) + @deprecated('APISite.version()', since='20141225') + def version(self, code): + """Return the version for this family.""" + if code == 'es': + return '1.33.1' + return super(Family, self).version(code) + @classproperty def langs(cls): """Property listing family languages.""" cls.langs = super(Family, cls).langs - cls.langs.update({code: cls.domains[1] for code in ('es', 'et')}) - cls.langs['uk'] = 'uk.' + cls.domains[2] + # override deviations + for i, lang in enumerate(['es', 'et', 'sv'], start=1): + cls.langs[lang] = cls.domains[i] + cls.langs['uk'] = cls.domains[-1] return cls.langs @classproperty @@ -66,16 +75,13 @@ @classproperty def domains(cls): """List of domains used by family wowwiki.""" - return [cls.domain, 'worldofwarcraft.fandom.com', 'warcraft.wikia.com'] - - def protocol(self, code): - """Return the protocol for this family.""" - if code == 'uk': - return 'http' - return super(Family, self).protocol(code) + return [cls.domain, + 'wow-es.gamepedia.com', # es + 'worldofwarcraft.fandom.com', # et + 'warcraft.fandom.com'] # sv, uk def scriptpath(self, code): """Return the script path for this family.""" - if code == 'uk': + if code == 'es': return '' return super(Family, self).scriptpath(code) -- To view, visit https://gerrit.wikimedia.org/r/572648 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I43be11f0d9f0a3fab44658ee407e15b350a0d7f7 Gerrit-Change-Number: 572648 Gerrit-PatchSet: 6 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [IMPR] Use dotted notation with flickrapi
by jenkins-bot (Code Review) 29 Feb '20

29 Feb '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/575680 ) Change subject: [IMPR] Use dotted notation with flickrapi ...................................................................... [IMPR] Use dotted notation with flickrapi See https://stuvel.eu/flickrapi-doc/1-intro.html Change-Id: Iff95414d9e86a410e9a0af8dd17de96f807c7d2a --- M scripts/flickrripper.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index 1edfe74..610fab0 100755 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -77,9 +77,9 @@ """ while True: try: - photoInfo = flickr.photos_getInfo(photo_id=photo_id) + photoInfo = flickr.photos.getInfo(photo_id=photo_id) # xml.etree.ElementTree.dump(photoInfo) - photoSizes = flickr.photos_getSizes(photo_id=photo_id) + photoSizes = flickr.photos.getSizes(photo_id=photo_id) # xml.etree.ElementTree.dump(photoSizes) return photoInfo, photoSizes except flickrapi.exceptions.FlickrError: -- To view, visit https://gerrit.wikimedia.org/r/575680 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Iff95414d9e86a410e9a0af8dd17de96f807c7d2a Gerrit-Change-Number: 575680 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: [deps] Update flickrapi requirements
by jenkins-bot (Code Review) 29 Feb '20

29 Feb '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/575677 ) Change subject: [deps] Update flickrapi requirements ...................................................................... [deps] Update flickrapi requirements Support for Python 2.7 and Python 3.4 will be dropped with next release 3.0. First explicit support for Python 3.5 was release 2.2 Change-Id: I4187d3246ef67066faba10fcc84f6a3f9abafff9 --- M requirements.txt M setup.py 2 files changed, 4 insertions(+), 2 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/requirements.txt b/requirements.txt index a1a78dc..b688d45 100644 --- a/requirements.txt +++ b/requirements.txt @@ -50,7 +50,8 @@ sseclient >= 0.0.18,!=0.0.23,!=0.0.24 # scripts/flickrripper.py -flickrapi +flickrapi < 3.0.0 ; python_version < '3.5' +flickrapi >= 2.2 ; python_version >= '3.5' # textlib.py and patrol.py mwparserfromhell>=0.3.3 diff --git a/setup.py b/setup.py index a9a6467..2ef2645 100644 --- a/setup.py +++ b/setup.py @@ -83,7 +83,8 @@ # ------- setup extra_requires for scripts ------- # script_deps = { 'flickrripper.py': [ - 'flickrapi', + 'flickrapi<3.0.0;python_version<"3.5"', + 'flickrapi>=2.2;python_version>="3.5"', 'Pillow<7.0.0;python_version<"3"', 'Pillow<6.0.0;python_version=="3.4"', 'Pillow;python_version>="3.5"', -- To view, visit https://gerrit.wikimedia.org/r/575677 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I4187d3246ef67066faba10fcc84f6a3f9abafff9 Gerrit-Change-Number: 575677 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: the id of the photo as last resort
by jenkins-bot (Code Review) 29 Feb '20

29 Feb '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/575279 ) Change subject: the id of the photo as last resort ...................................................................... the id of the photo as last resort Change-Id: I9b0240eded9fc3c5a7932e9bc5eb24447f052af1 --- M scripts/flickrripper.py 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index 904525d..dc9c058 100755 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -187,8 +187,8 @@ description = description[:items] title = cleanUpTitle(description) else: - title = '' - # Should probably have the id of the photo as last resort. + # Use the id of the photo as last resort. + title = photoInfo.find('photo').attrib['id'] if pywikibot.Page(site, 'File:{} - {} - {}.jpg' .format(title, project, username)).exists(): -- To view, visit https://gerrit.wikimedia.org/r/575279 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I9b0240eded9fc3c5a7932e9bc5eb24447f052af1 Gerrit-Change-Number: 575279 Gerrit-PatchSet: 3 Gerrit-Owner: Shizhao <shizhao(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <xsavitar.wiki(a)aol.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 27 Feb '20

27 Feb '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/575282 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I70ab0f7a6ed1b85ca3b02cabe022a491fe89c78a --- M pywikibot/be-tarask.json 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/be-tarask.json b/pywikibot/be-tarask.json index f4e52a9..fe24528 100644 --- a/pywikibot/be-tarask.json +++ b/pywikibot/be-tarask.json @@ -16,5 +16,5 @@ "pywikibot-fixes-fckeditor": "Робат: выпраўленьне html-разьметкі рэдактару ўзбагачанага тэксту", "pywikibot-fixes-html": "Робат: карэкцыя HTML", "pywikibot-fixes-syntax": "Бот выпраўляе вiкi-сынтаксiс", - "pywikibot-touch": "Праўка Pywikibot" + "pywikibot-touch": "Рэдагаваньне Pywikibot" } -- To view, visit https://gerrit.wikimedia.org/r/575282 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I70ab0f7a6ed1b85ca3b02cabe022a491fe89c78a Gerrit-Change-Number: 575282 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 (75)

1 0

[Gerrit] pywikibot/core[master]: update flickr license info
by jenkins-bot (Code Review) 26 Feb '20

26 Feb '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/575014 ) Change subject: update flickr license info ...................................................................... update flickr license info Change-Id: Ib62f2f0ae9e3c02a691dac3bddec218b29ed147c --- M scripts/flickrripper.py 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index 904525d..5b91da4 100755 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -52,7 +52,7 @@ except ImportError as e: flickrapi = e - +# see https://www.flickr.com/services/api/flickr.photos.licenses.getInfo.html flickr_allowed_license = { 0: False, # All Rights Reserved 1: False, # Creative Commons Attribution-NonCommercial-ShareAlike License @@ -63,6 +63,8 @@ 6: False, # Creative Commons Attribution-NoDerivs License 7: True, # No known copyright restrictions 8: True, # United States Government Work + 9: True, # Public Domain Dedication (CC0) + 10: True, # Public Domain Mark } -- To view, visit https://gerrit.wikimedia.org/r/575014 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: Ib62f2f0ae9e3c02a691dac3bddec218b29ed147c Gerrit-Change-Number: 575014 Gerrit-PatchSet: 4 Gerrit-Owner: Shizhao <shizhao(a)gmail.com> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Shizhao <shizhao(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/core[master]: Revert "[fix] Temporarily deactivate WikibaseKnownTypesTests for ws/w...
by jenkins-bot (Code Review) 24 Feb '20

24 Feb '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/477349 ) Change subject: Revert "[fix] Temporarily deactivate WikibaseKnownTypesTests for ws/wpbeta" ...................................................................... Revert "[fix] Temporarily deactivate WikibaseKnownTypesTests for ws/wpbeta" This reverts commit a9fd96b00220b5dc777e2d8ec9251b52dd3442dc. The underlying problem is solved in I7c17eaa670b Add unsupported 'entity-schema' data type Bug: T210322 Change-Id: I1265dcf336510423dbd0bd69b822bfb26bde9a7d --- M tests/paraminfo_tests.py 1 file changed, 2 insertions(+), 11 deletions(-) Approvals: Dvorapa: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/paraminfo_tests.py b/tests/paraminfo_tests.py index f97c317..f28eafe 100644 --- a/tests/paraminfo_tests.py +++ b/tests/paraminfo_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Test confirming paraminfo contains expected values.""" # -# (C) Pywikibot team, 2015-2018 +# (C) Pywikibot team, 2015-2020 # # Distributed under the terms of the MIT license. # @@ -222,16 +222,6 @@ """Verify Wikibase types using paraminfo.""" - @classmethod - def setUpClass(cls): - """Set up the test class.""" - super(WikibaseKnownTypesTests, cls).setUpClass() - for site in cls.sites.values(): - if site['site'].family.name.endswith('beta'): - raise unittest.SkipTest( - '{}: skipping {!r} due to Bug T210322' - .format(cls.__name__, site['site'])) - def test_entities(self): """Test known entities.""" unsupported = {'form', 'lexeme', 'sense'} # T195435 @@ -246,6 +236,7 @@ unsupported = { 'wikibase-form', 'wikibase-lexeme', 'wikibase-sense', # T194890 'musical-notation', # T218506 + 'entity-schema', # T245949 } known = set(Property.types) | unsupported self._check_param_superset( -- To view, visit https://gerrit.wikimedia.org/r/477349 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I1265dcf336510423dbd0bd69b822bfb26bde9a7d Gerrit-Change-Number: 477349 Gerrit-PatchSet: 7 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Framawiki <framawiki(a)tools.wmflabs.org> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

1 0

[Gerrit] pywikibot/i18n[master]: Localisation updates from https://translatewiki.net.
by jenkins-bot (Code Review) 24 Feb '20

24 Feb '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/574477 ) Change subject: Localisation updates from https://translatewiki.net. ...................................................................... Localisation updates from https://translatewiki.net. Change-Id: I15248c10e54adaa9de4698004d729ccc59081f01 --- M category/ne.json 1 file changed, 7 insertions(+), 6 deletions(-) Approvals: L10n-bot: Looks good to me, approved jenkins-bot: Verified diff --git a/category/ne.json b/category/ne.json index 834e81b..3702d2a 100644 --- a/category/ne.json +++ b/category/ne.json @@ -5,17 +5,18 @@ "RajeshPandey", "सरोज कुमार ढकाल", "Nirmal Dulal", - "Nirajan pant" + "Nirajan pant", + "हिमाल सुबेदी" ] }, - "category-adding": "रोबोट: श्रेणी [[:Category:%(newcat)s|%(newcat)s]] थप्दै", + "category-adding": "यन्त्र: श्रेणी [[:Category:%(newcat)s|%(newcat)s]] थप्दै", "category-also-in": "(%(alsocat)s मा पनि)", "category-listifying": "बोट: %(fromcat)sबाट (%(num)d entries)मा सूचीकृत गर्दै", - "category-removing": "रोबोट: %(oldcat)sबाट हटाउँदै", - "category-renamed": "रोबोट: %(oldcat)sबाट सारियो। लेखकहरू: %(authors)s", - "category-replacing": "रोबोट: %(oldcat)s श्रेणलाई %(newcat)sसंग साट्दै", + "category-removing": "यन्त्र: %(oldcat)sबाट हटाउँदै", + "category-renamed": "यन्त्र: %(oldcat)sबाट सारियो। लेखकहरू: %(authors)s", + "category-replacing": "यन्त्र: %(oldcat)s श्रेणलाई %(newcat)sसँग साट्दै", "category-section-title": "%(oldcat)sको पृष्ठ इतिहास", - "category-strip-cfd-templates": "बोट: सकिइसकेका कार्यहरूका CDF ढाँचाहरू हटाउँदै", + "category-strip-cfd-templates": "यन्त्र: सकिइसकेका कार्यहरूका सिडिइफ ढाँचाहरू हटाउँदै", "category-version-history": "रोबोट: %(oldcat)sको संस्करण इतिहास संग्रह गर्दै", "category-was-disbanded": "बोट: श्रेणीलाई अनिषेधित गरियो", "category-was-moved": "रोबोट: श्रेणीलाई [[:Category:%(newcat)s|%(title)s]]मा सारियो" -- To view, visit https://gerrit.wikimedia.org/r/574477 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/i18n Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I15248c10e54adaa9de4698004d729ccc59081f01 Gerrit-Change-Number: 574477 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 (75)

1 0

[Gerrit] pywikibot/core[master]: [bugfix] Fix mul Wikisource aliases
by jenkins-bot (Code Review) 24 Feb '20

24 Feb '20

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/573992 ) Change subject: [bugfix] Fix mul Wikisource aliases ...................................................................... [bugfix] Fix mul Wikisource aliases - move '-' alias from WikimediaFamily to wikisource_family.py as it is Wikisource-only - merge -, mul and www Wikisource aliases - improve code_aliases comments in WikimediaFamily - add beta Wikiversity and its mul alias - replace wowwiki interwiki_removals with removed_wikis as interwiki_removals include removed_wikis automatically Bug: T242537 Bug: T241413 Change-Id: I909eaacc570f72700b219388b92bb7582e40f152 --- M pywikibot/families/wikisource_family.py M pywikibot/families/wikiversity_family.py M pywikibot/families/wowwiki_family.py M pywikibot/family.py 4 files changed, 33 insertions(+), 20 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/families/wikisource_family.py b/pywikibot/families/wikisource_family.py index 11540ef..c5bb62f 100644 --- a/pywikibot/families/wikisource_family.py +++ b/pywikibot/families/wikisource_family.py @@ -29,7 +29,7 @@ languages_by_size = [ 'pl', 'en', 'ru', 'de', 'fr', 'zh', 'he', 'it', 'es', 'ar', 'cs', 'pt', - 'www', 'gu', 'fa', 'uk', 'hu', 'ml', 'sv', 'ko', 'sr', 'bn', 'sa', + 'mul', 'gu', 'fa', 'uk', 'hu', 'ml', 'sv', 'ko', 'sr', 'bn', 'sa', 'hy', 'sl', 'te', 'el', 'ro', 'fi', 'ja', 'nap', 'vi', 'ta', 'az', 'ca', 'br', 'th', 'nl', 'kn', 'hr', 'la', 'no', 'is', 'eo', 'vec', 'tr', 'pms', 'et', 'be', 'da', 'mk', 'id', 'yi', 'bg', 'li', 'mr', @@ -65,7 +65,17 @@ cls.domains.append(cls.langs['beta']) return cls.domains - languages_by_size.append('mul') + # All requests to unknown languages are also redirected to + # the main page, so using mul alias, see T114574 and T241413 + @classproperty + def code_aliases(cls): + cls.code_aliases = super(Family, cls).code_aliases.copy() + aliases = cls.alphabetic + ['-', 'www'] + for code in aliases: + if (code not in cls.languages_by_size + and code not in cls.code_aliases): + cls.code_aliases[code] = 'mul' + return cls.code_aliases # Global bot allowed languages on # https://meta.wikimedia.org/wiki/BPI#Current_implementation diff --git a/pywikibot/families/wikiversity_family.py b/pywikibot/families/wikiversity_family.py index da43f46..1225a72 100644 --- a/pywikibot/families/wikiversity_family.py +++ b/pywikibot/families/wikiversity_family.py @@ -8,6 +8,7 @@ from __future__ import absolute_import, division, unicode_literals from pywikibot import family +from pywikibot.tools import classproperty # The Wikimedia family that is known as Wikiversity @@ -18,10 +19,18 @@ name = 'wikiversity' languages_by_size = [ - 'de', 'en', 'fr', 'ru', 'zh', 'it', 'cs', 'beta', 'pt', 'es', 'ar', - 'sv', 'sl', 'fi', 'el', 'hi', 'ko', 'ja', + 'de', 'en', 'fr', 'ru', 'zh', 'it', 'cs', 'pt', 'es', 'ar', 'sv', 'sl', + 'fi', 'el', 'hi', 'ko', 'ja', ] + test_codes = ['beta'] + + @classproperty + def code_aliases(cls): + cls.code_aliases = super(Family, cls).code_aliases.copy() + cls.code_aliases['mul'] = 'beta' + return cls.code_aliases + category_redirect_templates = { '_default': (), 'ar': ('قالب:تحويل تصنيف',), diff --git a/pywikibot/families/wowwiki_family.py b/pywikibot/families/wowwiki_family.py index 10326f7..08129c9 100644 --- a/pywikibot/families/wowwiki_family.py +++ b/pywikibot/families/wowwiki_family.py @@ -24,7 +24,7 @@ 'pt-br', 'ru', 'sk', 'tr', 'uk', 'zh', 'zh-tw' ) - interwiki_removals = ['hr', 'ro', 'sr', 'sv'] + removed_wikis = ['hr', 'ro', 'sr', 'sv'] @classproperty @deprecated('codes attribute', since='20190422') diff --git a/pywikibot/family.py b/pywikibot/family.py index 935ab25..9dde337 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -1026,10 +1026,8 @@ if not all(x in NAME_CHARACTERS for x in cls.name): warn('Family name %s contains non-ascii characters' % cls.name, FamilyMaintenanceWarning) - # FIXME: wikisource uses code '-' for www.wikisource.org for code in cls.langs.keys(): - if not all(x in CODE_CHARACTERS for x in code) and \ - (cls.name == 'wikisource' or code[0] != '-'): + if not all(x in CODE_CHARACTERS for x in code): warn('Family %s code %s contains non-ascii characters' % (cls.name, code), FamilyMaintenanceWarning) Family._families[fam] = cls @@ -1658,32 +1656,28 @@ # For all except 'nl_nds', subdomains do exist as a redirect, but that # should not be relied upon. code_aliases = { - # Country aliases; see T87002 - 'dk': 'da', # Wikipedia, Wikibooks and Wiktionary only. + # Country aliases, see T87002 + 'dk': 'da', 'jp': 'ja', - # Language aliases - 'nb': 'no', # T86924 + # Language aliases, see T86924 + 'nb': 'no', - # closed wiki redirection aliases + # Closed wiki redirection aliases 'mo': 'ro', - # Incomplete language code change. T86915 + # Incomplete language code change, see T86915 'minnan': 'zh-min-nan', 'nan': 'zh-min-nan', - # These two probably only apply to Wikipedia. - # Server not found for the other projects. 'zh-tw': 'zh', 'zh-cn': 'zh', - # miss-spelling + # Miss-spelling 'nl_nds': 'nl-nds', - # Renamed; see T11823 + # Renamed, see T11823 'be-x-old': 'be-tarask', - - '-': 'mul', # T114574 } # Not open for edits; stewards can still edit. -- To view, visit https://gerrit.wikimedia.org/r/573992 To unsubscribe, or for help writing mail filters, visit https://gerrit.wikimedia.org/r/settings Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-MessageType: merged Gerrit-Change-Id: I909eaacc570f72700b219388b92bb7582e40f152 Gerrit-Change-Number: 573992 Gerrit-PatchSet: 24 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: Mpaa <mpaa.wiki(a)gmail.com>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2020