Pywikibot-commits February 2019

pywikibot-commits@lists.wikimedia.org

1 participants
103 discussions

[Gerrit] pywikibot/core[master]: [bugfix] Fix TypeError when instantiating DisambiguationRobot

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/491966 ) Change subject: [bugfix] Fix TypeError when instantiating DisambiguationRobot ...................................................................... [bugfix] Fix TypeError when instantiating DisambiguationRobot Make first_only an optional parameter Bug: T216715 Change-Id: I149f03ed7a52b98d55a3da98d6344afa0e1ef012 --- M scripts/solve_disambiguation.py 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: D3r1ck01: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/solve_disambiguation.py b/scripts/solve_disambiguation.py index cb7ddd4..6775345 100755 --- a/scripts/solve_disambiguation.py +++ b/scripts/solve_disambiguation.py @@ -626,7 +626,7 @@ } def __init__(self, always, alternatives, getAlternatives, dnSkip, - generator, primary, main_only, first_only, minimum=0): + generator, primary, main_only, first_only=False, minimum=0): """Initializer.""" super(DisambiguationRobot, self).__init__() self.always = always -- To view, visit https://gerrit.wikimedia.org/r/491966 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: I149f03ed7a52b98d55a3da98d6344afa0e1ef012 Gerrit-Change-Number: 491966 Gerrit-PatchSet: 2 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Bináris <wikiposta(a)gmail.com> Gerrit-Reviewer: Bináris2 <wikiposta+wikitech(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75) Gerrit-CC: Matěj Suchánek <matejsuchanek97(a)gmail.com>

5 years, 1 month

[Gerrit] pywikibot/core[master]: [doc] Add Ananth subray to CREDITS

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/492478 ) Change subject: [doc] Add Ananth subray to CREDITS ...................................................................... [doc] Add Ananth subray to CREDITS Change-Id: I31204b7878e88b3cc07d71303dfa8be1665bb33a --- M CREDITS 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: Ananth subray: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/CREDITS b/CREDITS index 14bd2c8..2a98c8b 100644 --- a/CREDITS +++ b/CREDITS @@ -13,6 +13,7 @@ Alexander Shtyrov Allen Guo Amir Sarabadani +Ananth subray André Costa Andre Engels André Malafaya Baptista -- To view, visit https://gerrit.wikimedia.org/r/492478 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: I31204b7878e88b3cc07d71303dfa8be1665bb33a Gerrit-Change-Number: 492478 Gerrit-PatchSet: 1 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Ananth subray <ananth.subray(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 1 month

[Gerrit] pywikibot/core[master]: [IMPR] Fix handling of interlanguage links in replace_links

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/491790 ) Change subject: [IMPR] Fix handling of interlanguage links in replace_links ...................................................................... [IMPR] Fix handling of interlanguage links in replace_links - fix iw link detection and allow to replace interlanguage links (starting with ':') - until now replace_links made [[:en:Foo]] > [[Bar]] for (:en:Foo > :en:Bar) - extracted from https://gerrit.wikimedia.org/r/#/c/pywikibot/core/+/491673/ Change-Id: Ie1cf22dd3f22129fe5edd20fc9713646912a678a --- M pywikibot/textlib.py M tests/textlib_tests.py 2 files changed, 54 insertions(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 1c71ed1..1a5f85c 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -710,10 +710,15 @@ m = link_pattern.search(text, pos=curpos) if not m: break - # ignore links to sections of the same page + # Ignore links to sections of the same page if not m.group('title').strip(): curpos = m.end() continue + # Ignore interwiki links + if (site.isInterwikiLink(m.group('title').strip()) + and not m.group('title').strip().startswith(':')): + curpos = m.end() + continue groups = m.groupdict() if groups['label'] and '[[' in groups['label']: # TODO: Work on the link within the label too @@ -740,10 +745,6 @@ # unrecognized iw prefix curpos = end continue - # ignore interwiki links - if link.site != site: - curpos = end - continue # Check whether the link found should be replaced. # Either None, False or tuple(Link, bool) @@ -792,6 +793,9 @@ is_link = False new_title = new_link.canonical_title() + # Make correct langlink if needed + if not new_link.site == site: + new_title = ':' + new_link.site.code + ':' + new_title if is_link: # Use link's label diff --git a/tests/textlib_tests.py b/tests/textlib_tests.py index 6b754da..2c6e7b0 100644 --- a/tests/textlib_tests.py +++ b/tests/textlib_tests.py @@ -1060,6 +1060,51 @@ ValueError, r'unicode \(str.*bytes \(str', textlib.replace_links, self.text, callback, self.wp_site) + def test_replace_interwiki_links(self): + """Make sure interwiki links can not be replaced.""" + link = '[[fr:how]]' + self.assertEqual( + textlib.replace_links(link, ('fr:how', 'de:are'), self.wp_site), + link) + self.assertEqual( + textlib.replace_links(link, (':fr:how', ':de:are'), self.wp_site), + link) + self.assertEqual( + textlib.replace_links(link, ('how', 'de:are'), self.wp_site), + link) + self.assertEqual( + textlib.replace_links(link, ('de:how', 'de:are'), self.wp_site), + link) + + +class TestReplaceLinksNonDry(TestCase): + """Test the replace_links function in textlib non-dry.""" + + family = 'wikipedia' + code = 'en' + + cached = True + + def test_replace_interlanguage_links(self): + """Test replacing interlanguage links.""" + link = '[[:fr:how]]' + self.assertEqual( + textlib.replace_links(link, (':fr:how', ':de:are'), + self.wp_site), + '[[:de:are]]') + self.assertEqual( + textlib.replace_links(link, ('fr:how', 'de:are'), + self.wp_site), + '[[:de:are]]') + self.assertEqual( + textlib.replace_links(link, ('how', ':de:are'), + self.wp_site), + link) + self.assertEqual( + textlib.replace_links(link, (':de:how', ':de:are'), + self.wp_site), + link) + class TestLocalDigits(TestCase): -- To view, visit https://gerrit.wikimedia.org/r/491790 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: Ie1cf22dd3f22129fe5edd20fc9713646912a678a Gerrit-Change-Number: 491790 Gerrit-PatchSet: 7 Gerrit-Owner: Dvorapa <dvorapa(a)seznam.cz> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> 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: Mpaa <mpaa.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: Zhuyifei1999 <zhuyifei1999(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 1 month

[Gerrit] pywikibot/core[master]: [cleanup] remove old pre Python 2.5 stuff

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/491045 ) Change subject: [cleanup] remove old pre Python 2.5 stuff ...................................................................... [cleanup] remove old pre Python 2.5 stuff - ctypes was introduces with Python 2.5. We only support 2.7 or higher and old parts can be removed. - Rename Win32CtypesUI to Win32UI - Derive Win32UI from terminal_interface_base.UI directly - Deprecate Win32CtypesUI and 'Win32BaseUI'. 'Win32UI' should be used instead - Change test accordingly Change-Id: Ie1b9423770c4a80cef05ebcd3351a5638022561c --- M pywikibot/userinterfaces/terminal_interface_win32.py M tests/ui_tests.py 2 files changed, 19 insertions(+), 17 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/userinterfaces/terminal_interface_win32.py b/pywikibot/userinterfaces/terminal_interface_win32.py index 6b94693..78f18c9 100755 --- a/pywikibot/userinterfaces/terminal_interface_win32.py +++ b/pywikibot/userinterfaces/terminal_interface_win32.py @@ -1,22 +1,20 @@ # -*- coding: utf-8 -*- """User interface for Win32 terminals.""" # -# (C) Pywikibot team, 2003-2018 +# (C) Pywikibot team, 2003-2019 # # Distributed under the terms of the MIT license. # from __future__ import absolute_import, division, unicode_literals +from pywikibot.tools import ModuleDeprecationWrapper + from pywikibot.userinterfaces import ( terminal_interface_base, win32_unicode, ) -try: - import ctypes - ctypes_found = True -except ImportError: - ctypes_found = False +import ctypes windowsColors = { 'default': 7, @@ -39,24 +37,23 @@ } -# Compat for python <= 2.5 class Win32BaseUI(terminal_interface_base.UI): - """User interface for Win32 terminals without ctypes.""" + """DEPRECATED. User interface for Win32 terminals without ctypes.""" def __init__(self): """Initializer.""" - terminal_interface_base.UI.__init__(self) + super(Win32BaseUI, self).__init__() self.encoding = 'ascii' -class Win32CtypesUI(Win32BaseUI): +class Win32UI(terminal_interface_base.UI): """User interface for Win32 terminals using ctypes.""" def __init__(self): """Initializer.""" - Win32BaseUI.__init__(self) + super(Win32CtypesUI, self).__init__() (stdin, stdout, stderr, argv) = win32_unicode.get_unicode_console() self.stdin = stdin self.stdout = stdout @@ -87,7 +84,12 @@ return data.strip() -if ctypes_found: - Win32UI = Win32CtypesUI -else: - Win32UI = Win32BaseUI +Win32CtypesUI = Win32UI + +wrapper = ModuleDeprecationWrapper(__name__) +wrapper._add_deprecated_attr('Win32CtypesUI', + replacement_name='Win32UI', + since='20190217') +wrapper._add_deprecated_attr('Win32BaseUI', + replacement_name='Win32UI', + since='20190217') diff --git a/tests/ui_tests.py b/tests/ui_tests.py index 1fbe330..a843d5e 100644 --- a/tests/ui_tests.py +++ b/tests/ui_tests.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Tests for the user interface.""" # -# (C) Pywikibot team, 2008-2018 +# (C) Pywikibot team, 2008-2019 # # Distributed under the terms of the MIT license. # @@ -834,7 +834,7 @@ net = False expected = 'Hello world you!' - ui_class = terminal_interface_win32.Win32CtypesUI + ui_class = terminal_interface_win32.Win32UI def setUp(self): """Patch the ctypes import and initialize a stream and UI instance.""" -- To view, visit https://gerrit.wikimedia.org/r/491045 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: Ie1b9423770c4a80cef05ebcd3351a5638022561c Gerrit-Change-Number: 491045 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: Merlijn van Deen <valhallasw(a)arctus.nl> Gerrit-Reviewer: jenkins-bot (75)

5 years, 1 month

[Gerrit] pywikibot/core[master]: [cleanup] Use tools.PY2 instead of sys.version_info

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/491046 ) Change subject: [cleanup] Use tools.PY2 instead of sys.version_info ...................................................................... [cleanup] Use tools.PY2 instead of sys.version_info Change-Id: I528cae132e738e5b78b0ca58482637465d34b761 --- M pywikibot/__init__.py M pywikibot/comms/http.py M pywikibot/comms/threadedhttp.py M pywikibot/data/sparql.py M pywikibot/data/wikistats.py M pywikibot/date.py M pywikibot/diff.py M pywikibot/family.py M pywikibot/logentries.py M pywikibot/page.py M pywikibot/pagegenerators.py M pywikibot/site.py M pywikibot/textlib.py M pywikibot/tools/chars.py M pywikibot/tools/ip.py M pywikibot/weblib.py M scripts/archive/featured.py M scripts/casechecker.py M scripts/category.py M scripts/data_ingestion.py M scripts/flickrripper.py M scripts/imagerecat.py M scripts/redirect.py M scripts/reflinks.py M scripts/replace.py M scripts/script_wui.py M scripts/weblinkchecker.py 27 files changed, 66 insertions(+), 90 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pywikibot/__init__.py b/pywikibot/__init__.py index 61b2699..c0f5214 100644 --- a/pywikibot/__init__.py +++ b/pywikibot/__init__.py @@ -15,7 +15,6 @@ from decimal import Decimal import math import re -import sys import threading import time @@ -72,7 +71,7 @@ from pywikibot.tools.formatter import color_format -if sys.version_info[0] > 2: +if not PY2: from queue import Queue long = int basestring = str diff --git a/pywikibot/comms/http.py b/pywikibot/comms/http.py index fc9b369..d1b7d61 100644 --- a/pywikibot/comms/http.py +++ b/pywikibot/comms/http.py @@ -12,7 +12,7 @@ - Basic HTTP error handling """ # -# (C) Pywikibot team, 2007-2018 +# (C) Pywikibot team, 2007-2019 # # Distributed under the terms of the MIT license. # @@ -52,7 +52,7 @@ except ImportError as e: requests_oauthlib = e -if sys.version_info[0] > 2: +if not PY2: from http import cookiejar as cookielib from urllib.parse import quote, urlparse else: diff --git a/pywikibot/comms/threadedhttp.py b/pywikibot/comms/threadedhttp.py index 065ae62..b902f67 100644 --- a/pywikibot/comms/threadedhttp.py +++ b/pywikibot/comms/threadedhttp.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Http backend layer, formerly providing a httplib2 wrapper.""" # -# (C) Pywikibot team, 2007-2018 +# (C) Pywikibot team, 2007-2019 # # Distributed under the terms of the MIT license. # @@ -13,12 +13,11 @@ # standard python libraries import codecs import re -import sys import pywikibot -from pywikibot.tools import deprecated, UnicodeMixin +from pywikibot.tools import deprecated, PY2, UnicodeMixin -if sys.version_info[0] > 2: +if not PY2: from urllib.parse import urlparse else: from urlparse import urlparse diff --git a/pywikibot/data/sparql.py b/pywikibot/data/sparql.py index ebe6605..813987c 100644 --- a/pywikibot/data/sparql.py +++ b/pywikibot/data/sparql.py @@ -1,23 +1,22 @@ # -*- coding: utf-8 -*- """SPARQL Query interface.""" # -# (C) Pywikibot team, 2016-2018 +# (C) Pywikibot team, 2016-2019 # # Distributed under the terms of the MIT license. # from __future__ import absolute_import, division, unicode_literals import json -import sys from requests.exceptions import Timeout from pywikibot import config, warning, Site, sleep from pywikibot.comms import http -from pywikibot.tools import UnicodeMixin, py2_encode_utf_8 +from pywikibot.tools import UnicodeMixin, PY2, py2_encode_utf_8 from pywikibot.exceptions import Error, TimeoutError -if sys.version_info[0] > 2: +if not PY2: from urllib.parse import quote else: from urllib2 import quote diff --git a/pywikibot/data/wikistats.py b/pywikibot/data/wikistats.py index 6cb1ee1..309e549 100644 --- a/pywikibot/data/wikistats.py +++ b/pywikibot/data/wikistats.py @@ -6,7 +6,6 @@ # Distributed under the terms of the MIT license. from __future__ import absolute_import, division, unicode_literals -import sys from io import BytesIO, StringIO import pywikibot @@ -149,7 +148,7 @@ data = self.raw_cached(table, 'csv') - if sys.version_info[0] > 2: + if not PY2: f = StringIO(data.decode('utf8')) else: f = BytesIO(data) diff --git a/pywikibot/date.py b/pywikibot/date.py index 683a37f..f924632 100644 --- a/pywikibot/date.py +++ b/pywikibot/date.py @@ -17,12 +17,11 @@ import datetime import re from string import digits as _decimalDigits # noqa: N812 -import sys from pywikibot.textlib import NON_LATIN_DIGITS -from pywikibot.tools import first_lower, first_upper, deprecated +from pywikibot.tools import first_lower, first_upper, deprecated, PY2 -if sys.version_info[0] > 2: +if not PY2: unicode = str basestring = (str,) diff --git a/pywikibot/diff.py b/pywikibot/diff.py index 7a49369..f536793 100644 --- a/pywikibot/diff.py +++ b/pywikibot/diff.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Diff module.""" # -# (C) Pywikibot team, 2014-2018 +# (C) Pywikibot team, 2014-2019 # # Distributed under the terms of the MIT license. # @@ -9,7 +9,6 @@ import difflib import math -import sys try: from collections.abc import Sequence @@ -18,11 +17,10 @@ from difflib import _format_range_unified as format_range_unified import pywikibot -from pywikibot.tools import chars -from pywikibot.tools import deprecated_args +from pywikibot.tools import chars, deprecated_args, PY2 from pywikibot.tools.formatter import color_format -if sys.version_info[0] > 2: +if not PY2: from itertools import zip_longest else: from itertools import izip_longest as zip_longest diff --git a/pywikibot/family.py b/pywikibot/family.py index bd769bb..d511407 100644 --- a/pywikibot/family.py +++ b/pywikibot/family.py @@ -23,11 +23,10 @@ from pywikibot.exceptions import UnknownFamily, FamilyMaintenanceWarning from pywikibot.tools import ( deprecated, deprecated_args, remove_last_args, issue_deprecation_warning, - FrozenDict, classproperty + FrozenDict, classproperty, PY2 ) -PY3 = sys.version_info[0] > 2 -if PY3: +if not PY2: import urllib.parse as urlparse else: import urlparse diff --git a/pywikibot/logentries.py b/pywikibot/logentries.py index 6020fee..4f070b6 100644 --- a/pywikibot/logentries.py +++ b/pywikibot/logentries.py @@ -7,13 +7,11 @@ # from __future__ import absolute_import, division, unicode_literals -import sys - import pywikibot from pywikibot.exceptions import Error, HiddenKeyError -from pywikibot.tools import deprecated, classproperty +from pywikibot.tools import deprecated, classproperty, PY2 -if sys.version_info[0] > 2: +if not PY2: basestring = (str, ) _logger = 'wiki' diff --git a/pywikibot/page.py b/pywikibot/page.py index 59c8f5a..c1433dd 100644 --- a/pywikibot/page.py +++ b/pywikibot/page.py @@ -5863,7 +5863,7 @@ return '[[%s:%s]]' % (self.site.code, title) return '[[%s:%s:%s]]' % (self.site.family.name, self.site.code, title) - if sys.version_info[0] > 2: + if not PY2: def __str__(self): """Return a string representation.""" return self.__unicode__() diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index a57efff..7b907fb 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -14,7 +14,7 @@ &params; """ # -# (C) Pywikibot team, 2008-2018 +# (C) Pywikibot team, 2008-2019 # # Distributed under the terms of the MIT license. # @@ -56,8 +56,9 @@ UnknownExtension, ) from pywikibot.proofreadpage import ProofreadPage +from pywikibot.tools import PY2 -if sys.version_info[0] > 2: +if not PY2: basestring = (str, ) from itertools import zip_longest else: diff --git a/pywikibot/site.py b/pywikibot/site.py index 0a2c5c6..7b0450a 100644 --- a/pywikibot/site.py +++ b/pywikibot/site.py @@ -21,7 +21,6 @@ import mimetypes import os import re -import sys import threading import time import uuid @@ -81,7 +80,7 @@ ) from pywikibot.tools.ip import is_IP -if sys.version_info[0] > 2: +if not PY2: from itertools import zip_longest from urllib.parse import urlencode, urlparse diff --git a/pywikibot/textlib.py b/pywikibot/textlib.py index 83d06df..2730c54 100644 --- a/pywikibot/textlib.py +++ b/pywikibot/textlib.py @@ -20,7 +20,6 @@ from collections import Sequence import datetime import re -import sys import pywikibot from pywikibot import config2 as config @@ -32,10 +31,11 @@ DeprecatedRegex, StringTypes, UnicodeType, - issue_deprecation_warning + issue_deprecation_warning, + PY2, ) -if sys.version_info[0] > 2: +if not PY2: from html.parser import HTMLParser basestring = (str,) unicode = str diff --git a/pywikibot/tools/chars.py b/pywikibot/tools/chars.py index 5c1eca5..7b09075 100644 --- a/pywikibot/tools/chars.py +++ b/pywikibot/tools/chars.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- """Character based helper functions(not wiki-dependent).""" # -# (C) Pywikibot team, 2015-2018 +# (C) Pywikibot team, 2015-2019 # # Distributed under the terms of the MIT license. # @@ -9,10 +9,10 @@ import sys -from pywikibot.tools import LazyRegex +from pywikibot.tools import LazyRegex, PY2 -if sys.version_info[0] > 2: +if not PY2: unicode = str diff --git a/pywikibot/tools/ip.py b/pywikibot/tools/ip.py index 42b28be..dd9b6fb 100644 --- a/pywikibot/tools/ip.py +++ b/pywikibot/tools/ip.py @@ -1,19 +1,18 @@ # -*- coding: utf-8 -*- """IP address tools module.""" # -# (C) Pywikibot team, 2014-2018 +# (C) Pywikibot team, 2014-2019 # # Distributed under the terms of the MIT license. # from __future__ import absolute_import, division, unicode_literals import re -import sys from distutils.version import StrictVersion from warnings import warn -from pywikibot.tools import DeprecatedRegex, UnicodeType +from pywikibot.tools import DeprecatedRegex, PY2, UnicodeType _ipaddress_e = _ipaddr_e = _ipaddr_version = None @@ -23,7 +22,7 @@ _ipaddress_e = e ip_address = None -if not ip_address or sys.version_info[0] < 3: +if not ip_address or PY2: try: from ipaddr import __version__ as _ipaddr_version except ImportError as e: @@ -36,7 +35,7 @@ _ipaddr_e = ImportError('ipaddr %s is broken.' % _ipaddr_version) if ip_address and ip_address.__module__ == 'ipaddress': - if sys.version_info[0] < 3: + if PY2: # This backport fails many tests # https://pypi.org/project/py2-ipaddress # It accepts u'1111' as a valid IP address. diff --git a/pywikibot/weblib.py b/pywikibot/weblib.py index e2df994..6617bf1 100644 --- a/pywikibot/weblib.py +++ b/pywikibot/weblib.py @@ -8,7 +8,6 @@ from __future__ import absolute_import, division, unicode_literals import json -import sys from time import sleep from xml.etree import ElementTree @@ -16,9 +15,9 @@ from pywikibot.comms import http from pywikibot import config2 -from pywikibot.tools import deprecated +from pywikibot.tools import deprecated, PY2 -if sys.version_info[0] > 2: +if not PY2: from urllib.parse import urlencode else: from urllib import urlencode diff --git a/scripts/archive/featured.py b/scripts/archive/featured.py index 0dea1e9..1a4fa9a 100755 --- a/scripts/archive/featured.py +++ b/scripts/archive/featured.py @@ -56,8 +56,8 @@ # # (C) Maxim Razin, 2005 # (C) Leonardo Gregianin, 2005-2008 -# (C) xqt, 2009-2018 -# (C) Pywikibot team, 2005-2018 +# (C) xqt, 2009-2019 +# (C) Pywikibot team, 2005-2019 # # Distributed under the terms of the MIT license. # @@ -65,7 +65,6 @@ import pickle import re -import sys import pywikibot @@ -73,9 +72,9 @@ from pywikibot.pagegenerators import PreloadingGenerator from pywikibot.tools.formatter import color_format -from pywikibot.tools import issue_deprecation_warning +from pywikibot.tools import issue_deprecation_warning, PY2 -if sys.version_info[0] > 2: +if not PY2: unichr = chr diff --git a/scripts/casechecker.py b/scripts/casechecker.py index 3b43a7d..08bd2f4 100755 --- a/scripts/casechecker.py +++ b/scripts/casechecker.py @@ -20,11 +20,11 @@ from pywikibot import i18n from pywikibot.data import api -from pywikibot.tools import first_lower, first_upper, formatter +from pywikibot.tools import first_lower, first_upper, formatter, PY2 from scripts.category import CategoryMoveRobot as CategoryMoveBot -if sys.version_info[0] > 2: +if not PY2: xrange = range diff --git a/scripts/category.py b/scripts/category.py index 8814ff4..c781311 100755 --- a/scripts/category.py +++ b/scripts/category.py @@ -129,7 +129,6 @@ import os import pickle import re -import sys from operator import methodcaller @@ -144,11 +143,11 @@ ) from pywikibot.cosmetic_changes import moved_links from pywikibot.tools import ( - deprecated_args, deprecated, ModuleDeprecationWrapper, open_archive + deprecated_args, deprecated, ModuleDeprecationWrapper, open_archive, PY2 ) from pywikibot.tools.formatter import color_format -if sys.version_info[0] > 2: +if not PY2: basestring = (str, ) # This is required for the text that is shown when you run this script diff --git a/scripts/data_ingestion.py b/scripts/data_ingestion.py index 348cfbc..ad1a66c 100755 --- a/scripts/data_ingestion.py +++ b/scripts/data_ingestion.py @@ -8,7 +8,7 @@ python pwb.py data_ingestion -csvdir:local_dir/ -page:config_page """ # -# (C) Pywikibot team, 2012-2018 +# (C) Pywikibot team, 2012-2019 # # Distributed under the terms of the MIT license. # @@ -20,23 +20,19 @@ import io import os import posixpath -import sys from warnings import warn import pywikibot from pywikibot.comms.http import fetch from pywikibot import pagegenerators from pywikibot.specialbots import UploadRobot -from pywikibot.tools import deprecated, deprecated_args +from pywikibot.tools import deprecated, deprecated_args, PY2 -if sys.version_info[0] > 2: +if not PY2: import csv -else: - import unicodecsv as csv - -if sys.version_info[0] > 2: from urllib.parse import urlparse else: + import unicodecsv as csv from urlparse import urlparse diff --git a/scripts/flickrripper.py b/scripts/flickrripper.py index 2cc0ccc..0aa2755 100755 --- a/scripts/flickrripper.py +++ b/scripts/flickrripper.py @@ -28,19 +28,19 @@ import hashlib import io import re -import sys import pywikibot from pywikibot import config, textlib from pywikibot.comms.http import fetch from pywikibot.specialbots import UploadRobot +from pywikibot.tools import PY2 try: from pywikibot.userinterfaces.gui import Tkdialog except ImportError as _tk_error: Tkdialog = _tk_error -if sys.version_info[0] > 2: +if not PY2: from urllib.parse import urlencode else: from urllib import urlencode diff --git a/scripts/imagerecat.py b/scripts/imagerecat.py index cdc9c57..c990cfb 100755 --- a/scripts/imagerecat.py +++ b/scripts/imagerecat.py @@ -27,7 +27,7 @@ """ # # (C) Multichill, 2008-2011 -# (C) Pywikibot team, 2008-2018 +# (C) Pywikibot team, 2008-2019 # # Distributed under the terms of the MIT license. # @@ -35,16 +35,15 @@ import re import socket -import sys import xml.etree.ElementTree import pywikibot from pywikibot import pagegenerators, textlib from pywikibot.comms.http import fetch -from pywikibot.tools import deprecated +from pywikibot.tools import deprecated, PY2 -if sys.version_info[0] > 2: +if not PY2: from urllib.parse import urlencode else: from urllib import urlencode diff --git a/scripts/redirect.py b/scripts/redirect.py index 2d77de4..72809c6 100755 --- a/scripts/redirect.py +++ b/scripts/redirect.py @@ -80,7 +80,6 @@ from __future__ import absolute_import, division, unicode_literals import datetime -import sys import pywikibot @@ -89,9 +88,9 @@ RedirectPageBot) from pywikibot.exceptions import ArgumentDeprecationWarning from pywikibot.textlib import extract_templates_and_params_regex_simple -from pywikibot.tools import issue_deprecation_warning +from pywikibot.tools import issue_deprecation_warning, PY2 -if sys.version_info[0] > 2: +if not PY2: basestring = (str, ) diff --git a/scripts/reflinks.py b/scripts/reflinks.py index aa842eb..dfbf37f 100755 --- a/scripts/reflinks.py +++ b/scripts/reflinks.py @@ -35,7 +35,7 @@ one from i18n/reflinks.py """ # (C) Nicolas Dumazet (NicDumZ), 2008 -# (C) Pywikibot team, 2008-2018 +# (C) Pywikibot team, 2008-2019 # # Distributed under the terms of the MIT license. # @@ -46,7 +46,6 @@ import re import socket import subprocess -import sys import tempfile from functools import partial @@ -58,13 +57,13 @@ from pywikibot.pagegenerators import ( XMLDumpPageGenerator as _XMLDumpPageGenerator, ) -from pywikibot.tools.formatter import color_format +from pywikibot.tools.formatter import color_format, PY2 import requests from scripts import noreferences -if sys.version_info[0] > 2: +if not PY2: import http.client as httplib from urllib.error import URLError else: diff --git a/scripts/replace.py b/scripts/replace.py index cb625fa..b6a7d63 100755 --- a/scripts/replace.py +++ b/scripts/replace.py @@ -149,7 +149,6 @@ except ImportError: # Python 2.7 from collections import Sequence import re -import sys import time import warnings @@ -164,18 +163,17 @@ deprecated, deprecated_args, issue_deprecation_warning, + PY2, ) from pywikibot.tools.formatter import color_format -if sys.version_info[0] > 2: +if not PY2: from queue import Queue long = int + basestring = (str, ) else: from Queue import Queue -if sys.version_info[0] > 2: - basestring = (str, ) - # This is required for the text that is shown when you run this script # with the parameter -help. diff --git a/scripts/script_wui.py b/scripts/script_wui.py index d405e85..572d045 100755 --- a/scripts/script_wui.py +++ b/scripts/script_wui.py @@ -18,7 +18,7 @@ """ # # (C) Dr. Trigon, 2012-2014 -# (C) Pywikibot team, 2013-2018 +# (C) Pywikibot team, 2013-2019 # # Distributed under the terms of the MIT license. # @@ -87,10 +87,10 @@ import pywikibot # pywikibot.botirc depends on https://pypi.org/project/irc import pywikibot.botirc - from pywikibot.tools.formatter import color_format +from pywikibot.tools import PY2 -if sys.version_info[0] > 2: +if not PY2: import _thread as thread else: import thread # noqa: H237 (module does not exist in Python 3) diff --git a/scripts/weblinkchecker.py b/scripts/weblinkchecker.py index b50a370..f47af6c 100755 --- a/scripts/weblinkchecker.py +++ b/scripts/weblinkchecker.py @@ -110,7 +110,6 @@ import pickle import re import socket -import sys import threading import time @@ -134,12 +133,12 @@ from pywikibot.pagegenerators import ( XMLDumpPageGenerator as _XMLDumpPageGenerator, ) -from pywikibot.tools import deprecated +from pywikibot.tools import deprecated, PY2 from pywikibot.tools.formatter import color_format import requests -if sys.version_info[0] > 2: +if not PY2: import http.client as httplib import urllib.parse as urlparse import urllib.request as urllib -- To view, visit https://gerrit.wikimedia.org/r/491046 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: I528cae132e738e5b78b0ca58482637465d34b761 Gerrit-Change-Number: 491046 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 1 month

[Gerrit] pywikibot/core[master]: [IMPR] Use importlib.import_module instead of __import__

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/491216 ) Change subject: [IMPR] Use importlib.import_module instead of __import__ ...................................................................... [IMPR] Use importlib.import_module instead of __import__ importlib.import_module was backported to Python 2.7 After dropping Python 2.6 __import__ is not needed here. Change-Id: I94b66307636de31874111aa7a2d3de3aeaa783c8 --- M pwb.py M pywikibot/bot.py M pywikibot/tools/__init__.py M pywikibot/version.py M scripts/maintenance/make_i18n_dict.py M tests/tools_tests.py 6 files changed, 18 insertions(+), 12 deletions(-) Approvals: Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index d6211ef..b8db45b 100755 --- a/pwb.py +++ b/pwb.py @@ -16,6 +16,7 @@ from __future__ import (absolute_import, division, print_function, unicode_literals) +from importlib import import_module import os import sys import types @@ -242,7 +243,7 @@ if file_package and file_package not in sys.modules: try: - __import__(file_package) + import_module(file_package) except ImportError as e: warn('Parent module %s not found: %s' % (file_package, e), ImportWarning) diff --git a/pywikibot/bot.py b/pywikibot/bot.py index ae1e335..6b11443 100644 --- a/pywikibot/bot.py +++ b/pywikibot/bot.py @@ -81,6 +81,7 @@ import codecs import datetime +from importlib import import_module import json import logging import logging.handlers @@ -1035,7 +1036,7 @@ global_help = _GLOBAL_HELP % module_name try: - module = __import__('%s' % module_name) + module = import_module('%s' % module_name) help_text = module.__doc__ if PY2 and isinstance(help_text, bytes): help_text = help_text.decode('utf-8') diff --git a/pywikibot/tools/__init__.py b/pywikibot/tools/__init__.py index 0b9095d..80b7e07 100644 --- a/pywikibot/tools/__init__.py +++ b/pywikibot/tools/__init__.py @@ -10,6 +10,7 @@ import collections import gzip import hashlib +from importlib import import_module import inspect import itertools import os @@ -374,7 +375,7 @@ def has_module(module): """Check whether a module can be imported.""" try: - __import__(module) + import_module(module) except ImportError: return False else: @@ -1974,7 +1975,7 @@ elif '.' in self._deprecated[attr][0]: try: package_name = self._deprecated[attr][0].split('.', 1)[0] - module = __import__(package_name) + module = import_module(package_name) context = {package_name: module} replacement = eval(self._deprecated[attr][0], context) self._deprecated[attr] = ( diff --git a/pywikibot/version.py b/pywikibot/version.py index b910310..3ec659d 100644 --- a/pywikibot/version.py +++ b/pywikibot/version.py @@ -3,7 +3,7 @@ # # (C) Merlijn 'valhallasw' van Deen, 2007-2014 # (C) xqt, 2010-2018 -# (C) Pywikibot team, 2007-2018 +# (C) Pywikibot team, 2007-2019 # # Distributed under the terms of the MIT license. # @@ -11,6 +11,7 @@ import codecs import datetime +from importlib import import_module import json import os import socket @@ -515,8 +516,8 @@ for name in root_packages: try: - package = __import__(name, level=0) - except Exception as e: + package = import_module(name) + except ImportError as e: data[name] = {'name': name, 'err': e} continue diff --git a/scripts/maintenance/make_i18n_dict.py b/scripts/maintenance/make_i18n_dict.py index 49194ed..22087d2 100755 --- a/scripts/maintenance/make_i18n_dict.py +++ b/scripts/maintenance/make_i18n_dict.py @@ -25,8 +25,8 @@ >>> bot.to_json() """ # -# (C) xqt, 2013-2018 -# (C) Pywikibot team, 2013-2018 +# (C) xqt, 2013-2019 +# (C) Pywikibot team, 2013-2019 # # Distributed under the terms of the MIT license. # @@ -34,6 +34,7 @@ print_function, unicode_literals) import codecs +from importlib import import_module import json import os @@ -48,7 +49,7 @@ """Initializer.""" modules = script.split('.') self.scriptname = modules[0] - self.script = __import__('scripts.' + self.scriptname) + self.script = import_module('scripts.' + self.scriptname) for m in modules: self.script = getattr(self.script, m) self.messages = {} diff --git a/tests/tools_tests.py b/tests/tools_tests.py index ce8722b..c474bd2 100644 --- a/tests/tools_tests.py +++ b/tests/tools_tests.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- """Test tools package alone which don't fit into other tests.""" # -# (C) Pywikibot team, 2015-2018 +# (C) Pywikibot team, 2015-2019 # # Distributed under the terms of the MIT license. from __future__ import absolute_import, division, unicode_literals @@ -13,6 +13,7 @@ from collections import Mapping from collections import OrderedDict import decimal +from importlib import import_module import inspect import os.path import subprocess @@ -125,7 +126,7 @@ """Test open_archive when bz2file library.""" old_bz2 = tools.bz2 try: - tools.bz2 = __import__('bz2file') + tools.bz2 = import_module('bz2file') self.assertEqual(self._get_content(self.base_file + '.bz2'), self.original_content) self.assertEqual(self._get_content(self.base_file + '.bz2', -- To view, visit https://gerrit.wikimedia.org/r/491216 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: I94b66307636de31874111aa7a2d3de3aeaa783c8 Gerrit-Change-Number: 491216 Gerrit-PatchSet: 3 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: John Vandenberg <jayvdb(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 1 month

[Gerrit] pywikibot/core[master]: [compat] Remove compat.rst subpackage tree

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/481331 ) Change subject: [compat] Remove compat.rst subpackage tree ...................................................................... [compat] Remove compat.rst subpackage tree Remove compat.rst subpackage tree which isn't used anymore for autogenerated doc. This is a follow-up patch of I9d61e1e where compat subpackage entry was deleted from docs because these deprecated methods should not be used anymore. Bug: T183085 Change-Id: I762ae95c010435df74570d8a34c8a7fb2bc92920 --- D docs/api_ref/pywikibot.compat.rst 1 file changed, 0 insertions(+), 36 deletions(-) Approvals: Dvorapa: Looks good to me, but someone else must approve Dalba: Looks good to me, approved jenkins-bot: Verified diff --git a/docs/api_ref/pywikibot.compat.rst b/docs/api_ref/pywikibot.compat.rst deleted file mode 100644 index 0695049..0000000 --- a/docs/api_ref/pywikibot.compat.rst +++ /dev/null @@ -1,36 +0,0 @@ -pywikibot.compat package -======================== - -.. automodule:: pywikibot.compat - :members: - :undoc-members: - :show-inheritance: - -Submodules ----------- - -pywikibot.compat.catlib module ------------------------------- - -.. automodule:: pywikibot.compat.catlib - :members: - :undoc-members: - :show-inheritance: - -pywikibot.compat.query module ------------------------------ - -.. automodule:: pywikibot.compat.query - :members: - :undoc-members: - :show-inheritance: - -pywikibot.compat.userlib module -------------------------------- - -.. automodule:: pywikibot.compat.userlib - :members: - :undoc-members: - :show-inheritance: - - -- To view, visit https://gerrit.wikimedia.org/r/481331 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: I762ae95c010435df74570d8a34c8a7fb2bc92920 Gerrit-Change-Number: 481331 Gerrit-PatchSet: 4 Gerrit-Owner: Xqt <info(a)gno.de> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> 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: Multichill <maarten(a)mdammers.nl> Gerrit-Reviewer: jenkins-bot (75)

5 years, 1 month

[Gerrit] pywikibot/core[master]: pwb.py: Simplify the import system

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/492466 ) Change subject: pwb.py: Simplify the import system ...................................................................... pwb.py: Simplify the import system - Use `import pywikibot as pwb` instead of `pwb = pywikibot` in the else clause of the try statement. - There is no need to call tryimport_pwb in main() because it's already been imported earlier. - There is no need to call tryimport_pwb in run_python_file(), just make sure it is imported before calling it. - No need for remove_modules() function. AFAICT, none of the config-dependant modules can be loaded successfully when the config file is not present. Removing and reimporting others is of no use. - Remove the tryimport_pwb() as is it no longer used. Change-Id: I49d728e08edd14edb5b4203d46349f39c1b75dc3 --- M pwb.py 1 file changed, 3 insertions(+), 30 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/pwb.py b/pwb.py index 369e789..80c9aac 100755 --- a/pwb.py +++ b/pwb.py @@ -46,30 +46,6 @@ pwb = None -def remove_modules(): - """Remove pywikibot modules.""" - for name in list(sys.modules): - if name.startswith('pywikibot'): - del sys.modules[name] - - -def tryimport_pwb(): - """Try to import pywikibot. - - If so, we need to patch pwb.argvu, too. - If pywikibot is not available, we create a mock object to remove the - need for if statements further on. - """ - global pwb - try: - import pywikibot - except RuntimeError: - remove_modules() - os.environ['PYWIKIBOT_NO_USER_CONFIG'] = '2' - import pywikibot - pwb = pywikibot - - # The following snippet was developed by Ned Batchelder (and others) # for coverage [1], with python 3 support [2] added later, # and is available under the BSD license (see [3]) @@ -87,8 +63,6 @@ `args` is the argument array to present as sys.argv, as unicode strings. """ - tryimport_pwb() - # Create a module to serve as __main__ old_main_mod = sys.modules['__main__'] # it's explicitly using str() to bypass unicode_literals in Python 2 @@ -174,8 +148,10 @@ _pwb_dir = str(_pwb_dir) os.environ['PYWIKIBOT_DIR_PWB'] = _pwb_dir try: - import pywikibot + import pywikibot as pwb except RuntimeError: + os.environ['PYWIKIBOT_NO_USER_CONFIG'] = '2' + import pywikibot as pwb # user-config.py to be created if filename is not None and not (filename.startswith('generate_') or filename == 'version.py'): @@ -188,8 +164,6 @@ # we need to re-start the entire process. Ask the user to do so. print('Now, you have to re-execute the command to start your script.') sys.exit(1) -else: - pwb = pywikibot def main(): @@ -197,7 +171,6 @@ global filename if filename: file_package = None - tryimport_pwb() argvu = pwb.argvu[1:] if not os.path.exists(filename): script_paths = ['scripts', -- To view, visit https://gerrit.wikimedia.org/r/492466 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: I49d728e08edd14edb5b4203d46349f39c1b75dc3 Gerrit-Change-Number: 492466 Gerrit-PatchSet: 2 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 1 month

[Gerrit] pywikibot/core[master]: test_protectedpages_create: Do not expect pages to not exist

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/492465 ) Change subject: test_protectedpages_create: Do not expect pages to not exist ...................................................................... test_protectedpages_create: Do not expect pages to not exist Bug: T205883 Change-Id: I723edb2b2c7cdfc67c9eecdce591933b151c21c5 --- M tests/site_tests.py 1 file changed, 1 insertion(+), 5 deletions(-) Approvals: Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/site_tests.py b/tests/site_tests.py index 3b94764..0e0f1eb 100644 --- a/tests/site_tests.py +++ b/tests/site_tests.py @@ -989,11 +989,7 @@ raise unittest.SkipTest('requires v1.15+') pages = list(self.get_site().protectedpages(type='create', total=10)) - for page in pages: - self.assertFalse( - page.exists(), - '\n{page} does unexpectedly exist on site {page.site}' - .format(page=page)) + # Do not check for the existence of pages as they might exist (T205883) self.assertLessEqual(len(pages), 10) def test_protectedpages_edit(self): -- To view, visit https://gerrit.wikimedia.org/r/492465 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: I723edb2b2c7cdfc67c9eecdce591933b151c21c5 Gerrit-Change-Number: 492465 Gerrit-PatchSet: 1 Gerrit-Owner: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Dalba <dalba.wiki(a)gmail.com> Gerrit-Reviewer: Xqt <info(a)gno.de> Gerrit-Reviewer: jenkins-bot (75)

5 years, 1 month

[Gerrit] pywikibot/core[master]: Added Kannada Template:welcome in welcome.py

by jenkins-bot (Code Review)

jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/492461 ) Change subject: Added Kannada Template:welcome in welcome.py ...................................................................... Added Kannada Template:welcome in welcome.py Bug: T216871 Change-Id: I3ff6ddb26c7e7a23e72c6e66aca89d8f2ed72dae --- M scripts/welcome.py 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Zoranzoki21: Looks good to me, but someone else must approve Xqt: Looks good to me, approved jenkins-bot: Verified diff --git a/scripts/welcome.py b/scripts/welcome.py index 26a12ca..efd03df 100755 --- a/scripts/welcome.py +++ b/scripts/welcome.py @@ -276,6 +276,7 @@ 'ar': '{{subst:ترحيب}} %s', 'bn': '{{subst:স্বাগতম}} %s', 'bs': '{{Dobrodošlica}} %s', + 'kn': '{{subst:ಸುಸ್ವಾಗತ}} %s', 'mr': '{{subst:Welcome}} %s', }, 'wiktionary': { @@ -283,6 +284,7 @@ 'bn': '{{subst:স্বাগতম|%s}}', 'bs': '{{Dobrodošlica}} %s', 'fa': '{{جا:خوشامد|%s}}', + 'kn': '{{subst:ಸುಸ್ವಾಗತ}} %s', 'it': '{{subst:Utente:Filnik/Benve|firma=%s}}', 'ur': '{{جا:خوش آمدید}}%s', }, -- To view, visit https://gerrit.wikimedia.org/r/492461 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: I3ff6ddb26c7e7a23e72c6e66aca89d8f2ed72dae Gerrit-Change-Number: 492461 Gerrit-PatchSet: 4 Gerrit-Owner: Ananth subray <ananth.subray(a)gmail.com> Gerrit-Reviewer: Ananth subray <ananth.subray(a)gmail.com> Gerrit-Reviewer: D3r1ck01 <alangiderick(a)gmail.com> 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: Zoranzoki21 <zorandori4444(a)gmail.com> Gerrit-Reviewer: jenkins-bot (75)

5 years, 1 month

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

Pywikibot-commits February 2019